diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-08-21 11:29:31 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2018-08-21 11:29:31 +0200 |
commit | 3091a76724a6452bb70dc324dd1a7e4359c0af5d (patch) | |
tree | 7448eae5b9c1642fc4464094f88c845e1604f7ad /app/models/member.rb | |
parent | b755753c0c7c5ea3e803e4479ae14ef373d75067 (diff) | |
download | gitlab-ce-3091a76724a6452bb70dc324dd1a7e4359c0af5d.tar.gz |
Fix SQL error when sorting 2FA-enabled users by name in admin area
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/models/member.rb')
-rw-r--r-- | app/models/member.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/member.rb b/app/models/member.rb index 05c0bc8cb97..d9b4e8d2ac6 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -103,7 +103,7 @@ class Member < ActiveRecord::Base def filter_by_2fa(value) case value when 'enabled' - left_join_users.merge(User.with_two_factor_indistinct) + left_join_users.merge(User.with_two_factor) when 'disabled' left_join_users.merge(User.without_two_factor) else |