diff options
| author | Valery Sizov <valery@gitlab.com> | 2016-12-09 16:59:23 +0200 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2016-12-09 16:59:23 +0200 |
| commit | 858ec6048223f2eec8c1386d33e3a6c5827233cb (patch) | |
| tree | cdbbb678c823ee935b1e601fb89e34a58c67bbc0 /app/controllers/import | |
| parent | 89cc2064a2ebfe947d257c9c15c63825edc73bee (diff) | |
| download | gitlab-ce-858ec6048223f2eec8c1386d33e3a6c5827233cb.tar.gz | |
Handling OAuth2 errors
Diffstat (limited to 'app/controllers/import')
| -rw-r--r-- | app/controllers/import/bitbucket_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/import/bitbucket_controller.rb b/app/controllers/import/bitbucket_controller.rb index 12716d60e7d..b9cc6556140 100644 --- a/app/controllers/import/bitbucket_controller.rb +++ b/app/controllers/import/bitbucket_controller.rb @@ -2,7 +2,7 @@ class Import::BitbucketController < Import::BaseController before_action :verify_bitbucket_import_enabled before_action :bitbucket_auth, except: :callback - rescue_from OAuth::Error, with: :bitbucket_unauthorized + rescue_from OAuth2::Error, with: :bitbucket_unauthorized rescue_from Bitbucket::Error::Unauthorized, with: :bitbucket_unauthorized def callback |