From 13272cad0b5e74d26722a227b4965944d65b0e79 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 26 Sep 2023 21:10:08 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/controllers/oauth/authorizations_controller.rb | 4 ---- 1 file changed, 4 deletions(-) (limited to 'app/controllers') 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 -- cgit v1.2.3