diff options
author | Alexis Reigel <alexis.reigel.ext@siemens.com> | 2018-08-14 15:43:46 +0200 |
---|---|---|
committer | Alexis Reigel <alexis.reigel.ext@siemens.com> | 2019-03-14 18:15:40 +0100 |
commit | 70261ff11c93dcad30b0f4b3b61c4289d0ae1bb3 (patch) | |
tree | 6157c1cfd5b02e78ede0de294ed5af2d080d1ce9 /lib | |
parent | c53704398435e6585dbf7e26415a55162fa4e4a8 (diff) | |
download | gitlab-ce-70261ff11c93dcad30b0f4b3b61c4289d0ae1bb3.tar.gz |
add users search results to global search
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/search_results.rb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb index 491148ec1a6..28946ceacf6 100644 --- a/lib/gitlab/search_results.rb +++ b/lib/gitlab/search_results.rb @@ -32,6 +32,8 @@ module Gitlab merge_requests.page(page).per(per_page) when 'milestones' milestones.page(page).per(per_page) + when 'users' + users.page(page).per(per_page) else Kaminari.paginate_array([]).page(page).per(per_page) end @@ -71,6 +73,12 @@ module Gitlab end # rubocop: enable CodeReuse/ActiveRecord + # rubocop:disable CodeReuse/ActiveRecord + def limited_users_count + @limited_users_count ||= users.limit(count_limit).count + end + # rubocop:enable CodeReuse/ActiveRecord + def single_commit_result? false end @@ -129,6 +137,12 @@ module Gitlab end # rubocop: enable CodeReuse/ActiveRecord + def users + return [] unless Ability.allowed?(current_user, :read_users_list) + + UsersFinder.new(current_user, search: query).execute + end + def default_scope 'projects' end |