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:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-14 16:41:28 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-03-14 16:41:28 +0400
commite07b2f527fcaff6f2a998b0a74b0669389fbbbe6 (patch)
tree340e0a081e6cb7295b0c880de63a2e2592796801 /app/services/search/global_service.rb
parent02b310dffbd4f65883e8b388edbd04afb87d2dd0 (diff)
Fix global search
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/services/search/global_service.rb')
-rw-r--r--app/services/search/global_service.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/services/search/global_service.rb b/app/services/search/global_service.rb
index 09c7cb25dd5..372d1bf7129 100644
--- a/app/services/search/global_service.rb
+++ b/app/services/search/global_service.rb
@@ -14,9 +14,10 @@ module Search
group = Group.find_by(id: params[:group_id]) if params[:group_id].present?
projects = Project.accessible_to(current_user)
projects = projects.where(namespace_id: group.id) if group
- projects = projects.search(query)
project_ids = projects.pluck(:id)
+ projects = projects.search(query)
+
result[:projects] = projects.limit(20)
result[:merge_requests] = MergeRequest.in_projects(project_ids).search(query).order('updated_at DESC').limit(20)
result[:issues] = Issue.where(project_id: project_ids).search(query).order('updated_at DESC').limit(20)