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
2016-03-19 19:03:33 +00:00 · 2016-03-19 19:03:33 +00:00 · 64b57ec86a
parent 0ce7c1e494 ce45389a4d
commit 64b57ec86a
1 changed files with 1 additions and 0 deletions
--- a/app/controllers/oauth/authorizations_controller.rb
+++ b/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"