BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 64b57ec8 by Douwe Maan
Options

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

attempting to fix omniauth problem Attempt to fix https://gitlab.com/gitlab-org/gitlab-ce/issues/3361 See merge request !2876
parents 0ce7c1e4 ce45389a
Showing with 1 addition and 0 deletions
app/controllers/oauth/authorizations_controller.rb
......@@ -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"
......
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