summaryrefslogtreecommitdiff
path: root/lib/api/helpers
diff options
context:
space:
mode:
authorJan Provaznik <jprovaznik@gitlab.com>2019-03-16 08:19:02 +0100
committerJan Provaznik <jprovaznik@gitlab.com>2019-03-16 08:19:02 +0100
commita68c1cdc38ffe8d4fe21c1bf562c8456c354da7f (patch)
tree40626328888ffa46d3495f2f9dc219d1ee006e88 /lib/api/helpers
parentb53376592491cf2016fe68fecaf5f090cf4627b4 (diff)
parent27ac48c394780df923eeb94f3a7f47f6a5f4c649 (diff)
downloadgitlab-ce-users-search-results.tar.gz
Merge branch 'siemens/gitlab-ce-feature/users-search-results' into users-search-resultsusers-search-results
Diffstat (limited to 'lib/api/helpers')
-rw-r--r--lib/api/helpers/search_helpers.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/api/helpers/search_helpers.rb b/lib/api/helpers/search_helpers.rb
index 47fb5a36327..0e052e0e273 100644
--- a/lib/api/helpers/search_helpers.rb
+++ b/lib/api/helpers/search_helpers.rb
@@ -5,17 +5,17 @@ module API
module SearchHelpers
def self.global_search_scopes
# This is a separate method so that EE can redefine it.
- %w(projects issues merge_requests milestones snippet_titles snippet_blobs)
+ %w(projects issues merge_requests milestones snippet_titles snippet_blobs users)
end
def self.group_search_scopes
# This is a separate method so that EE can redefine it.
- %w(projects issues merge_requests milestones)
+ %w(projects issues merge_requests milestones users)
end
def self.project_search_scopes
# This is a separate method so that EE can redefine it.
- %w(issues merge_requests milestones notes wiki_blobs commits blobs)
+ %w(issues merge_requests milestones notes wiki_blobs commits blobs users)
end
end
end