Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-09-27 00:10:08 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-09-27 00:10:08 +0300
commit13272cad0b5e74d26722a227b4965944d65b0e79 (patch)
treed5d4b05fab2b6149e482e7c60c21ba9bd427ce01 /app/controllers
parent332df93cf612d3ad71e35f6dc214f9b984d45287 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/oauth/authorizations_controller.rb4
1 files changed, 0 insertions, 4 deletions
diff --git a/app/controllers/oauth/authorizations_controller.rb b/app/controllers/oauth/authorizations_controller.rb
index 9d85ec081d7..a541e7e703f 100644
--- a/app/controllers/oauth/authorizations_controller.rb
+++ b/app/controllers/oauth/authorizations_controller.rb
@@ -14,18 +14,14 @@ class Oauth::AuthorizationsController < Doorkeeper::AuthorizationsController
# include the call to session.delete
def new
if pre_auth.authorizable?
-
if skip_authorization? || (matching_token? && pre_auth.client.application.confidential?)
auth = authorization.authorize
parsed_redirect_uri = URI.parse(auth.redirect_uri)
session.delete(:user_return_to)
- Authorizations::NotificationService.new(current_user).execute
-
render "doorkeeper/authorizations/redirect", locals: { redirect_uri: parsed_redirect_uri }, layout: false
else
redirect_uri = URI(authorization.authorize.redirect_uri)
allow_redirect_uri_form_action(redirect_uri.scheme)
- Authorizations::NotificationService.new(current_user).execute
render "doorkeeper/authorizations/new"
end