Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/search_results.rb')
-rw-r--r--lib/gitlab/search_results.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb
index 93befc2df57..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
@@ -174,7 +178,9 @@ module Gitlab
# rubocop: enable CodeReuse/ActiveRecord
def projects
- limit_projects.search(query)
+ scope = limit_projects
+ scope = scope.non_archived if Feature.enabled?(:search_projects_hide_archived) && !filters[:include_archived]
+ scope.search(query)
end
def issues(finder_params = {})