diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-03-19 19:03:33 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-03-19 19:03:33 +0000 |
| commit | 64b57ec86a74f0a45412c6b6b415b09e86a4eb97 (patch) | |
| tree | 5a22115961e5b82e8d0980d3ac3cf48dea2ecf70 /app/controllers | |
| parent | 0ce7c1e494403cba995b77cd9dec09d79256d13d (diff) | |
| parent | ce45389a4d9b9405112a22daaa4e6808201414e0 (diff) | |
| download | gitlab-ce-64b57ec86a74f0a45412c6b6b415b09e86a4eb97.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
Diffstat (limited to 'app/controllers')
| -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" |