Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
16c76781
Commit
16c76781
authored
Feb 21, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Re-enable rescuing from Bitbucket OAuth errors.
parent
bc80efb1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
app/controllers/import/bitbucket_controller.rb
app/controllers/import/bitbucket_controller.rb
+1
-1
config/routes.rb
config/routes.rb
+1
-0
No files found.
app/controllers/import/bitbucket_controller.rb
View file @
16c76781
...
@@ -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
)
...
...
config/routes.rb
View file @
16c76781
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment