Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Reigel <alexis.reigel.ext@siemens.com>2018-08-15 14:53:23 +0300
committerAlexis Reigel <alexis.reigel.ext@siemens.com>2019-03-14 20:16:03 +0300
commit22f44b50d8ece6cdb2d83cb8e2b1c5b51f01d70d (patch)
tree8bde2d73db686a43f8e8a323ea59c3992ee10550 /lib/gitlab/project_search_results.rb
parent70261ff11c93dcad30b0f4b3b61c4289d0ae1bb3 (diff)
add users search results to project scoped search
Diffstat (limited to 'lib/gitlab/project_search_results.rb')
-rw-r--r--lib/gitlab/project_search_results.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/gitlab/project_search_results.rb b/lib/gitlab/project_search_results.rb
index a68f8801c2a..0957d1b6149 100644
--- a/lib/gitlab/project_search_results.rb
+++ b/lib/gitlab/project_search_results.rb
@@ -22,11 +22,17 @@ module Gitlab
paginated_blobs(wiki_blobs, page)
when 'commits'
Kaminari.paginate_array(commits).page(page).per(per_page)
+ when 'users'
+ users.page(page).per(per_page)
else
super(scope, page, false)
end
end
+ def users
+ super.where(id: @project.users)
+ end
+
def blobs_count
@blobs_count ||= blobs.count
end