diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-13 06:08:26 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-13 06:08:26 +0300 |
| commit | 2fc7740f3ca1ca5e5a88f9f4136d631f7650bac7 (patch) | |
| tree | 7cf264cf713a0372160954b055d5b27227e5e375 /app/controllers/omniauth_callbacks_controller.rb | |
| parent | 8dc1e72e2b5cb6112d5468194580edb186de4659 (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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index 534afcbab99..4c595313cb6 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -6,6 +6,9 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController include Devise::Controllers::Rememberable include AuthHelper include InitializesCurrentUserMode + include KnownSignIn + + after_action :verify_known_sign_in protect_from_forgery except: [:kerberos, :saml, :cas3, :failure], with: :exception, prepend: true |