diff options
| author | Roger Meier <r.meier@siemens.com> | 2019-06-03 07:15:53 +0300 |
|---|---|---|
| committer | Roger Meier <r.meier@siemens.com> | 2019-06-13 09:43:14 +0300 |
| commit | 35d928c4a9fe7c8545f2ad1866a45ff28c1ef5d3 (patch) | |
| tree | 1fbc5564681bb15335d6fc19a9231c377170ab10 /app | |
| parent | ff22dfbf7a4f539b676101b51e5ad892d56da920 (diff) | |
refactor: apply "require 2FA" to all subgroup and ancestor group members, when changing
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/group.rb | 2 | ||||
| -rw-r--r-- | app/models/user.rb | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/models/group.rb b/app/models/group.rb index 5e58b48a366..ba9f6221567 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? - User.from_union([users_with_descendants, project_users_with_descendants]).find_each(&:update_two_factor_requirement) + direct_and_indirect_members.find_each(&:update_two_factor_requirement) end def path_changed_hook diff --git a/app/models/user.rb b/app/models/user.rb index 916a0aa74f0..2eb5c63a4cc 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -728,8 +728,7 @@ class User < ApplicationRecord end def expanded_groups_requiring_two_factor_authentication - Group.from_union([all_expanded_groups.where(require_two_factor_authentication: true), - authorized_groups.where(require_two_factor_authentication: true)]) + all_expanded_groups.where(require_two_factor_authentication: true) end # rubocop: disable CodeReuse/ServiceClass |