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:
authorAlexis Reigel <mail@koffeinfrei.org>2017-03-09 22:38:13 +0300
committerAlexis Reigel <mail@koffeinfrei.org>2017-04-06 11:01:14 +0300
commit20575859b1bf431421427d52c4ac5a33cf662df6 (patch)
tree54f8ac4eca2b8239530a956cac65c7378e5c7d97 /app/controllers/concerns
parent5ea4e34f4755e9a15503a6f16fd1574dc7864b23 (diff)
check all groups for 2fa requirement
Diffstat (limited to 'app/controllers/concerns')
-rw-r--r--app/controllers/concerns/enforces_two_factor_authentication.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/concerns/enforces_two_factor_authentication.rb b/app/controllers/concerns/enforces_two_factor_authentication.rb
index 3e0c62172de..28ffe0ba4b1 100644
--- a/app/controllers/concerns/enforces_two_factor_authentication.rb
+++ b/app/controllers/concerns/enforces_two_factor_authentication.rb
@@ -29,7 +29,7 @@ module EnforcesTwoFactorAuthentication
if current_application_settings.require_two_factor_authentication?
global.call
else
- groups = current_user.groups.where(require_two_factor_authentication: true).reorder(name: :asc)
+ groups = current_user.expanded_groups_requiring_two_factor_authentication.reorder(name: :asc)
group.call(groups)
end
end