diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-07-28 15:33:16 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-07-28 15:33:16 +0200 |
| commit | 42ebd902de707c8ddc35b97983ec0eee16458e56 (patch) | |
| tree | 09d1c674b115d92848d296b8edde9a6852cb927a /app/controllers/import | |
| parent | 43d118803133558209973464b1c16fd4c7ba446c (diff) | |
| download | gitlab-ce-42ebd902de707c8ddc35b97983ec0eee16458e56.tar.gz | |
Fix bug causing Bitbucket importer to crash when OAuth application had been removed.bitbucket-re-authorize
Diffstat (limited to 'app/controllers/import')
| -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) |