Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKartikey Tanna <tannakartikey@gmail.com>2019-06-18 19:18:14 +0300
committerKamil TrzciƄski <ayufan@ayufan.eu>2019-06-18 19:18:14 +0300
commit53af3e6b9e6fd221f2b6da1f6029017cf4a23831 (patch)
treee8d9bc09eb215b0a2b8fcb4a0a4f4aaedff23557 /app/controllers/concerns/enforces_two_factor_authentication.rb
parentc8f18c50a8e3bf9de66552be46ecd093c65572a7 (diff)
#57815 Password authentication disabled for UltraAuth users
Disabled password authentication for the users registered using omniauth-ultraauth strategy
Diffstat (limited to 'app/controllers/concerns/enforces_two_factor_authentication.rb')
-rw-r--r--app/controllers/concerns/enforces_two_factor_authentication.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/concerns/enforces_two_factor_authentication.rb b/app/controllers/concerns/enforces_two_factor_authentication.rb
index 0fddf15d197..825181568ad 100644
--- a/app/controllers/concerns/enforces_two_factor_authentication.rb
+++ b/app/controllers/concerns/enforces_two_factor_authentication.rb
@@ -23,7 +23,8 @@ module EnforcesTwoFactorAuthentication
def two_factor_authentication_required?
Gitlab::CurrentSettings.require_two_factor_authentication? ||
- current_user.try(:require_two_factor_authentication_from_group?)
+ current_user.try(:require_two_factor_authentication_from_group?) ||
+ current_user.try(:ultraauth_user?)
end
# rubocop: disable CodeReuse/ActiveRecord