diff options
| author | Robert Speicher <robert@gitlab.com> | 2015-07-28 21:57:44 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2015-07-28 21:57:44 +0000 |
| commit | 0f77d4095e39acb6ac35135194fb80245b35cba0 (patch) | |
| tree | 323ef18109e2fed874c84aa0e1849d6b3ed53230 /app | |
| parent | f8bfd065aa010955e9435347cb92b92006f0d5bf (diff) | |
| parent | 42ebd902de707c8ddc35b97983ec0eee16458e56 (diff) | |
| download | gitlab-ce-0f77d4095e39acb6ac35135194fb80245b35cba0.tar.gz | |
Merge branch 'bitbucket-re-authorize' into 'master'
Fix bug causing Bitbucket importer to crash when OAuth application
had been removed.
Fixes gitlab-com/support-forum#241.
See merge request !1057
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/import/bitbucket_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/import/bitbucket_controller.rb b/app/controllers/import/bitbucket_controller.rb index ca78a4aaa8e..af0b841f0b7 100644 --- a/app/controllers/import/bitbucket_controller.rb +++ b/app/controllers/import/bitbucket_controller.rb @@ -3,6 +3,7 @@ class Import::BitbucketController < Import::BaseController before_action :bitbucket_auth, except: :callback rescue_from OAuth::Error, with: :bitbucket_unauthorized + rescue_from Gitlab::BitbucketImport::Client::Unauthorized, with: :bitbucket_unauthorized def callback request_token = session.delete(:oauth_request_token) |