diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-03-19 19:03:33 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-21 12:37:02 +0100 |
| commit | d22c1069d3a091e0c630aed84f25cef71907ecb5 (patch) | |
| tree | fe1e8547b6db7ea49869e86bee1cc2309cac7f54 | |
| parent | a2484ae05282835e3c8e4665ec569843330860ab (diff) | |
| download | gitlab-ce-d22c1069d3a091e0c630aed84f25cef71907ecb5.tar.gz | |
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
| -rw-r--r-- | app/controllers/oauth/authorizations_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb index 24025d8c723..c721dca58d9 100644 --- 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" |