diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-24 18:09:51 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-24 18:09:51 +0300 |
| commit | a17eb314cff10a779ef550b1eb203ec9a61afdb9 (patch) | |
| tree | a0dca3d550ff6d4bafb25093277861ed3ba47c88 /app/controllers/omniauth_callbacks_controller.rb | |
| parent | 6f15c2c2723dbe14e907379b75201e2ef70a48d3 (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, 1 insertions, 2 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index b798d6680bc..2708e6669e7 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -1,8 +1,7 @@ # frozen_string_literal: true class OmniauthCallbacksController < Devise::OmniauthCallbacksController - include AuthenticatesWithTwoFactor - include Authenticates2FAForAdminMode + include AuthenticatesWithTwoFactorForAdminMode include Devise::Controllers::Rememberable include AuthHelper include InitializesCurrentUserMode |