From 6438df3a1e0fb944485cebf07976160184697d72 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 20 Jan 2021 13:34:23 -0600
Subject: Add latest changes from gitlab-org/gitlab@13-8-stable-ee

---
 app/finders/users_finder.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'app/finders/users_finder.rb')

diff --git a/app/finders/users_finder.rb b/app/finders/users_finder.rb
index cc94536bf79..42042406f3f 100644
--- a/app/finders/users_finder.rb
+++ b/app/finders/users_finder.rb
@@ -34,6 +34,7 @@ class UsersFinder
     users = User.all.order_id_desc
     users = by_username(users)
     users = by_id(users)
+    users = by_admins(users)
     users = by_search(users)
     users = by_blocked(users)
     users = by_active(users)
@@ -62,6 +63,12 @@ class UsersFinder
     users.id_in(params[:id])
   end
 
+  def by_admins(users)
+    return users unless params[:admins] && current_user&.can_read_all_resources?
+
+    users.admins
+  end
+
   def by_search(users)
     return users unless params[:search].present?
 
-- 
cgit v1.2.3