Commit 16c76781 authored by Douwe Maan's avatar Douwe Maan

Re-enable rescuing from Bitbucket OAuth errors.

parent bc80efb1
...@@ -2,7 +2,7 @@ class Import::BitbucketController < Import::BaseController ...@@ -2,7 +2,7 @@ class Import::BitbucketController < Import::BaseController
before_filter :verify_bitbucket_import_enabled before_filter :verify_bitbucket_import_enabled
before_filter :bitbucket_auth, except: :callback before_filter :bitbucket_auth, except: :callback
# rescue_from OAuth::Error, with: :bitbucket_unauthorized rescue_from OAuth::Error, with: :bitbucket_unauthorized
def callback def callback
request_token = session.delete(:oauth_request_token) request_token = session.delete(:oauth_request_token)
......
...@@ -73,6 +73,7 @@ Gitlab::Application.routes.draw do ...@@ -73,6 +73,7 @@ Gitlab::Application.routes.draw do
get :callback get :callback
get :jobs get :jobs
end end
resource :gitorious, only: [:create, :new], controller: :gitorious do resource :gitorious, only: [:create, :new], controller: :gitorious do
get :status get :status
get :callback get :callback
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment