Commit 17a9ecf8cf6724613b38c08040bdb786ffe30718
1 parent
e07b2f52
Exists in
spb-stable
and in
3 other branches
Remove confusing code
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
1 changed file
with
1 additions
and
3 deletions
Show diff stats
app/services/search/global_service.rb
| @@ -16,9 +16,7 @@ module Search | @@ -16,9 +16,7 @@ module Search | ||
| 16 | projects = projects.where(namespace_id: group.id) if group | 16 | projects = projects.where(namespace_id: group.id) if group |
| 17 | project_ids = projects.pluck(:id) | 17 | project_ids = projects.pluck(:id) |
| 18 | 18 | ||
| 19 | - projects = projects.search(query) | ||
| 20 | - | ||
| 21 | - result[:projects] = projects.limit(20) | 19 | + result[:projects] = projects.search(query).limit(20) |
| 22 | result[:merge_requests] = MergeRequest.in_projects(project_ids).search(query).order('updated_at DESC').limit(20) | 20 | result[:merge_requests] = MergeRequest.in_projects(project_ids).search(query).order('updated_at DESC').limit(20) |
| 23 | result[:issues] = Issue.where(project_id: project_ids).search(query).order('updated_at DESC').limit(20) | 21 | result[:issues] = Issue.where(project_id: project_ids).search(query).order('updated_at DESC').limit(20) |
| 24 | result[:total_results] = %w(projects issues merge_requests).sum { |items| result[items.to_sym].size } | 22 | result[:total_results] = %w(projects issues merge_requests).sum { |items| result[items.to_sym].size } |