diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-01 21:10:06 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-01 21:10:06 +0000 |
| commit | f7bc7dc5eafc4eef9043a3d1b2dcbc15ca76a571 (patch) | |
| tree | 8577ded3a5ac4c2b76d7194066fccf9882159956 /app/controllers/oauth | |
| parent | c3afdb42ddc7f24d51032ed0daef071a2dafdc93 (diff) | |
| download | gitlab-ce-f7bc7dc5eafc4eef9043a3d1b2dcbc15ca76a571.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/oauth')
| -rw-r--r-- | app/controllers/oauth/authorizations_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb index 857f36e3833..ddf70c1892a 100644 --- a/app/controllers/oauth/authorizations_controller.rb +++ b/app/controllers/oauth/authorizations_controller.rb @@ -14,8 +14,9 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController if pre_auth.authorizable? if skip_authorization? || matching_token? auth = authorization.authorize + parsed_redirect_uri = URI.parse(auth.redirect_uri) session.delete(:user_return_to) - redirect_to auth.redirect_uri + render "doorkeeper/authorizations/redirect", locals: { redirect_uri: parsed_redirect_uri }, layout: false else render "doorkeeper/authorizations/new" end |