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!
1 file
+ 1
8
Compare changes
  • Side-by-side
  • Inline
+ 1
8
@@ -66,14 +66,7 @@ def elasticsearch?
@@ -66,14 +66,7 @@ def elasticsearch?
end
end
params :scope do |options|
params :scope do |options|
scope_entities =
values = SCOPE_ENTITY.stringify_keys.slice(*options[:values]).keys
if Feature.enabled?(:users_search, default_enabled: true)
SCOPE_ENTITY
else
SCOPE_ENTITY.reject { |key, value| key == :users }
end
values = scope_entities.stringify_keys.slice(*options[:values]).keys
values += %w[wiki_blobs blobs commits] if Gitlab::CurrentSettings.elasticsearch_search?
values += %w[wiki_blobs blobs commits] if Gitlab::CurrentSettings.elasticsearch_search?
requires :scope,
requires :scope,
Loading