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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
ce45389a
Commit
ce45389a
authored
Feb 19, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
another attempt to fix oauth issue
parent
097b635b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
app/controllers/oauth/authorizations_controller.rb
app/controllers/oauth/authorizations_controller.rb
+1
-1
No files found.
app/controllers/oauth/authorizations_controller.rb
View file @
ce45389a
...
@@ -7,7 +7,7 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
...
@@ -7,7 +7,7 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
if
pre_auth
.
authorizable?
if
pre_auth
.
authorizable?
if
skip_authorization?
||
matching_token?
if
skip_authorization?
||
matching_token?
auth
=
authorization
.
authorize
auth
=
authorization
.
authorize
reset_session
session
.
delete
(
:user_return_to
)
redirect_to
auth
.
redirect_uri
redirect_to
auth
.
redirect_uri
else
else
render
"doorkeeper/authorizations/new"
render
"doorkeeper/authorizations/new"
...
...
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