diff options
| author | Roger Rüttimann <ror@panter.ch> | 2019-02-06 17:29:55 +0100 |
|---|---|---|
| committer | Roger Meier <r.meier@siemens.com> | 2019-06-13 08:43:14 +0200 |
| commit | dfe5ffd4edd34adc9dbb941f22a8843ee4f12e6d (patch) | |
| tree | 9772eacd3791f6427e032eeed856a24cc1a57aa1 | |
| parent | 54a918d92aa606d9e8977a30b4f08756c1d39dd2 (diff) | |
| download | gitlab-ce-dfe5ffd4edd34adc9dbb941f22a8843ee4f12e6d.tar.gz | |
second try: fix mysql problem (not all users found)
| -rw-r--r-- | app/models/user.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 916a0aa74f0..f3deea75dbb 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -728,8 +728,8 @@ 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).merge( + authorized_groups.where(require_two_factor_authentication: true)) end # rubocop: disable CodeReuse/ServiceClass |