Skip to content
Snippets Groups Projects

[EE] Add users search results to global search

Merged [EE] Add users search results to global search
ee-users-search-results into master
All threads resolved!
Merged Jan Provaznik requested to merge ee-users-search-results into master
All threads resolved!
Viewing commit c51f628d
Show latest version
7 files
+ 81
− 4
Compare changes
  • Side-by-side
  • Inline
Files
7
  • c51f628d
    Jan Provaznik
    Enable user search · c51f628d
    Jan Provaznik authored 
    If elasticsearch is enabled, we fall back to non-elasticsearch
logic when searching for users.
app/services/search/global_service.rb
+ 2
− 1
@@ -12,7 +12,8 @@ def initialize(user, params)
@@ -12,7 +12,8 @@ def initialize(user, params)
def execute
def execute
if Gitlab::CurrentSettings.elasticsearch_search?
if Gitlab::CurrentSettings.elasticsearch_search?
Gitlab::Elastic::SearchResults.new(current_user, params[:search], elastic_projects, elastic_global)
Gitlab::Elastic::SearchResults.new(current_user, params[:search],
 
elastic_projects, projects, elastic_global)
else
else
Gitlab::SearchResults.new(current_user, projects, params[:search],
Gitlab::SearchResults.new(current_user, projects, params[:search],
default_project_filter: default_project_filter)
default_project_filter: default_project_filter)