diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-17 21:09:20 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-17 21:09:20 +0300 |
| commit | 6f05d35c3160e3a442b40d6af1e8e584747080b3 (patch) | |
| tree | f70f90e1ae24f2366a538972c5520f524663ad86 /app/controllers/omniauth_callbacks_controller.rb | |
| parent | d88ab3545c27cd674f5fb8bff5fb64a9eeed590f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/omniauth_callbacks_controller.rb')
| -rw-r--r-- | app/controllers/omniauth_callbacks_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index c1c4a110aae..927b50245a4 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -9,7 +9,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController after_action :verify_known_sign_in - protect_from_forgery except: [:saml, :cas3, :failure] + AuthHelper.saml_providers, with: :exception, prepend: true + protect_from_forgery except: [:cas3, :failure] + AuthHelper.saml_providers, with: :exception, prepend: true feature_category :authentication_and_authorization |