diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-02-21 11:08:05 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-02-24 15:07:25 +0100 |
| commit | 16c767814a921ab0d7ad3c551bb439a9e270f7b7 (patch) | |
| tree | 5f14611daeb9b8a1113482b042e5856dbfaed53e | |
| parent | bc80efb1fd2978a328fdc89a3164f60bcf7ed604 (diff) | |
| download | gitlab-ce-16c767814a921ab0d7ad3c551bb439a9e270f7b7.tar.gz | |
Re-enable rescuing from Bitbucket OAuth errors.
| -rw-r--r-- | app/controllers/import/bitbucket_controller.rb | 2 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/import/bitbucket_controller.rb b/app/controllers/import/bitbucket_controller.rb index 89de5c5205f..83ebc5fddca 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_filter :verify_bitbucket_import_enabled before_filter :bitbucket_auth, except: :callback - # rescue_from OAuth::Error, with: :bitbucket_unauthorized + rescue_from OAuth::Error, with: :bitbucket_unauthorized def callback request_token = session.delete(:oauth_request_token) diff --git a/config/routes.rb b/config/routes.rb index 57964bdc3b7..450895cbdb7 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -73,6 +73,7 @@ Gitlab::Application.routes.draw do get :callback get :jobs end + resource :gitorious, only: [:create, :new], controller: :gitorious do get :status get :callback |