Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

1 files changed, 1 insertions, 12 deletions

diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
index 2454b5ea818..707e4efe7bf 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -11,23 +11,12 @@ if Gitlab::Auth::Ldap::Config.enabled?
   end
 end
 
-module OmniAuth
-  module Strategies
-    class AzureActivedirectoryV2
-      # override until https://github.com/RIPAGlobal/omniauth-azure-activedirectory-v2/pull/6 is merged
-      def callback_url
-        full_host + callback_path
-      end
-    end
-  end
-end
-
 OmniAuth.config.full_host = Gitlab::OmniauthInitializer.full_host
 
 OmniAuth.config.allowed_request_methods = [:post]
 # In case of auto sign-in, the GET method is used (users don't get to click on a button)
 OmniAuth.config.allowed_request_methods << :get if Gitlab.config.omniauth.auto_sign_in_with_provider.present?
-OmniAuth.config.before_request_phase do |env|
+OmniAuth.config.request_validation_phase do |env|
   Gitlab::RequestForgeryProtection.call(env)
 end