Re-enable rescuing from Bitbucket OAuth errors.

This commit is contained in:
Douwe Maan 2015-02-21 11:08:05 +01:00
parent bc80efb1fd
commit 16c767814a
2 changed files with 2 additions and 1 deletions

View File

@ -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)

View File

@ -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