diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 21:18:33 +0300 |
| commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
| tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /app/finders/users_finder.rb | |
| parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) | |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'app/finders/users_finder.rb')
| -rw-r--r-- | app/finders/users_finder.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/app/finders/users_finder.rb b/app/finders/users_finder.rb index 42042406f3f..5ac905e0dd4 100644 --- a/app/finders/users_finder.rb +++ b/app/finders/users_finder.rb @@ -14,6 +14,7 @@ # active: boolean # blocked: boolean # external: boolean +# non_external: boolean # without_projects: boolean # sort: string # id: integer @@ -40,6 +41,7 @@ class UsersFinder users = by_active(users) users = by_external_identity(users) users = by_external(users) + users = by_non_external(users) users = by_2fa(users) users = by_created_at(users) users = by_without_projects(users) @@ -97,13 +99,18 @@ class UsersFinder # rubocop: disable CodeReuse/ActiveRecord def by_external(users) - return users = users.where.not(external: true) unless current_user&.admin? return users unless params[:external] users.external end # rubocop: enable CodeReuse/ActiveRecord + def by_non_external(users) + return users unless params[:non_external] + + users.non_external + end + def by_2fa(users) case params[:two_factor] when 'enabled' |