home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-18 00:56:41 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/gitlab-omniauth-issue' into 'master'

Browse Source 
attempting to fix omniauth problem

Attempt to fix https://gitlab.com/gitlab-org/gitlab-ce/issues/3361

See merge request !2876
This commit is contained in:
Douwe Maan
2016-03-21 12:37:02 +01:00
committed by Rémy Coutable
parent a2484ae052
commit d22c1069d3
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/oauth/authorizations_controller.rb
+1
View File
@@ -7,6 +7,7 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
if pre_auth.authorizable?
if skip_authorization? || matching_token?
auth = authorization.authorize
session.delete(:user_return_to)
redirect_to auth.redirect_uri
else
render "doorkeeper/authorizations/new"