summaryrefslogtreecommitdiff
path: root/Procfile
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-08-23 20:40:36 +0000
committerDouwe Maan <douwe@gitlab.com>2015-08-23 20:40:36 +0000
commit24b282aeeaf5ba41c6b73100051eb48428787770 (patch)
treec7d208bd6be17632a314eb090456f1a30f42f13b /Procfile
parent97cc91d21d28a6482dc6ab040db31598a786f56c (diff)
parented1d4fa477789659f9343593bf06d50e70750561 (diff)
downloadgitlab-ce-24b282aeeaf5ba41c6b73100051eb48428787770.tar.gz
Merge branch 'clear-and-retry-bitbucket-access-token' into 'master'
Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab and request them each session Remove user OAuth tokens stored in database for Bitbucket, GitHub, and GitLab and request them each session. Pass these tokens to the project import data. This prevents the need to encrypt these tokens and clear them in case they expire or get revoked. For example, if you deleted and re-created OAuth2 keys for Bitbucket, you would get an Error 500 with no way to recover: ``` Started GET "/import/bitbucket/status" for x.x.x.x at 2015-08-07 05:24:10 +0000 Processing by Import::BitbucketController#status as HTML Completed 500 Internal Server Error in 607ms (ActiveRecord: 2.3ms) NameError (uninitialized constant Import::BitbucketController::Unauthorized): app/controllers/import/bitbucket_controller.rb:77:in `rescue in go_to_bitbucket_for_permissions' app/controllers/import/bitbucket_controller.rb:74:in `go_to_bitbucket_for_permissions' app/controllers/import/bitbucket_controller.rb:86:in `bitbucket_unauthorized' ``` Closes #1871 See merge request !1112
Diffstat (limited to 'Procfile')
0 files changed, 0 insertions, 0 deletions