diff options
Diffstat (limited to 'app/finders/users_finder.rb')
| -rw-r--r-- | app/finders/users_finder.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/finders/users_finder.rb b/app/finders/users_finder.rb index b983882b272..9c2462b42a6 100644 --- a/app/finders/users_finder.rb +++ b/app/finders/users_finder.rb @@ -47,6 +47,7 @@ class UsersFinder users = by_without_projects(users) users = by_custom_attributes(users) users = by_non_internal(users) + users = by_without_project_bots(users) order(users) end @@ -54,7 +55,8 @@ class UsersFinder private def base_scope - User.all.order_id_desc + scope = current_user&.admin? ? User.all : User.without_forbidden_states + scope.order_id_desc end def by_username(users) @@ -138,6 +140,12 @@ class UsersFinder users.non_internal end + def by_without_project_bots(users) + return users unless params[:without_project_bots] + + users.without_project_bot + end + # rubocop: disable CodeReuse/ActiveRecord def order(users) return users unless params[:sort] |