From e07b2f527fcaff6f2a998b0a74b0669389fbbbe6 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Fri, 14 Mar 2014 14:41:28 +0200 Subject: Fix global search Signed-off-by: Dmitriy Zaporozhets --- app/services/search/global_service.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/services/search/global_service.rb') 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) -- cgit v1.2.3