Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 1 deletions

diff --git a/lib/gitlab/gon_helper.rb b/lib/gitlab/gon_helper.rb
index 2d875742430..bf46c28af9d 100644
--- a/lib/gitlab/gon_helper.rb
+++ b/lib/gitlab/gon_helper.rb
@@ -73,6 +73,7 @@ module Gitlab
       push_frontend_feature_flag(:command_palette, current_user)
       # To be removed with https://gitlab.com/gitlab-org/gitlab/-/issues/399248
       push_frontend_feature_flag(:remove_monitor_metrics)
+      push_frontend_feature_flag(:gitlab_duo, current_user)
     end
 
     # Exposes the state of a feature flag to the frontend code.
diff --git a/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb
index 16a03f2356c..a733dca6a56 100644
--- a/lib/gitlab/search_results.rb
+++ b/lib/gitlab/search_results.rb
@@ -107,7 +107,11 @@ module Gitlab
     def users
       return User.none unless Ability.allowed?(current_user, :read_users_list)
 
-      UsersFinder.new(current_user, search: query).execute
+      if Feature.enabled?(:autocomplete_users_use_search_service)
+        UsersFinder.new(current_user, { search: query, use_minimum_char_limit: false }).execute
+      else
+        UsersFinder.new(current_user, search: query).execute
+      end
     end
 
     # highlighting is only performed by Elasticsearch backed results