Skip to content
Snippets Groups Projects

[EE] Add users search results to global search

Merged Jan Provaznik requested to merge ee-users-search-results into master
All threads resolved!
7 files
+ 109
4
Compare changes
  • Side-by-side
  • Inline
Files
7
  • adaefe19
    Enable user search · adaefe19
    Jan Provaznik authored
    If elasticsearch is enabled, we fall back to non-elasticsearch
    logic when searching for users.
@@ -13,8 +13,13 @@ def initialize(user, params)
@@ -13,8 +13,13 @@ def initialize(user, params)
end
end
def execute
def execute
Gitlab::SearchResults.new(current_user, projects, params[:search],
if Gitlab::CurrentSettings.elasticsearch_search?
default_project_filter: default_project_filter)
Gitlab::Elastic::SearchResults.new(current_user, params[:search],
 
elastic_projects, projects, elastic_global)
 
else
 
Gitlab::SearchResults.new(current_user, projects, params[:search],
 
default_project_filter: default_project_filter)
 
end
end
end
def projects
def projects
Loading