diff options
author | Roger Rüttimann <ror@panter.ch> | 2019-02-07 15:20:58 +0100 |
---|---|---|
committer | Roger Meier <r.meier@siemens.com> | 2019-06-13 08:43:14 +0200 |
commit | 28782d5165fee8251321fce65e54c4722a4db581 (patch) | |
tree | d97207a33921788e07949e5533cc19b4f6bc15b4 /app/models/group.rb | |
parent | dfe5ffd4edd34adc9dbb941f22a8843ee4f12e6d (diff) | |
download | gitlab-ce-28782d5165fee8251321fce65e54c4722a4db581.tar.gz |
remove experiments for 2fa requirements and fix tests
Diffstat (limited to 'app/models/group.rb')
-rw-r--r-- | app/models/group.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index dd8baddd789..5e58b48a366 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -423,7 +423,7 @@ class Group < Namespace def update_two_factor_requirement return unless saved_change_to_require_two_factor_authentication? || saved_change_to_two_factor_grace_period? - [users_with_descendants, project_users_with_descendants].each {|set| set.find_each(&:update_two_factor_requirement)} + User.from_union([users_with_descendants, project_users_with_descendants]).find_each(&:update_two_factor_requirement) end def path_changed_hook |