Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 9 deletions

diff --git a/app/finders/users_finder.rb b/app/finders/users_finder.rb
index 57dbeca5c51..13c4aae5b25 100644
--- a/app/finders/users_finder.rb
+++ b/app/finders/users_finder.rb
@@ -80,15 +80,11 @@ class UsersFinder
   def by_search(users)
     return users unless params[:search].present?
 
-    if Feature.enabled?(:autocomplete_users_use_search_service)
-      users.search(
-        params[:search],
-        with_private_emails: current_user&.can_admin_all_resources?,
-        use_minimum_char_limit: params[:use_minimum_char_limit]
-      )
-    else
-      users.search(params[:search], with_private_emails: current_user&.can_admin_all_resources?)
-    end
+    users.search(
+      params[:search],
+      with_private_emails: current_user&.can_admin_all_resources?,
+      use_minimum_char_limit: params[:use_minimum_char_limit]
+    )
   end
 
   def by_blocked(users)