diff --git a/app/controllers/import/bitbucket_controller.rb b/app/controllers/import/bitbucket_controller.rb index 89de5c5205f0c8f1d7fa45a2cb22b0206dc4ddf4..83ebc5fddca5139fbc9151033f4eae4f28429f3d 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 57964bdc3b7d217d50337c209e4b17434d4a5997..450895cbdb75219eb5704b27f2c894b42b118d68 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