diff options
author | Valery Sizov <vsv2711@gmail.com> | 2015-08-13 17:48:21 +0300 |
---|---|---|
committer | Valery Sizov <vsv2711@gmail.com> | 2015-08-24 13:59:01 +0300 |
commit | 56527b63e8a09e0fe4967eabf08638d853e6b2b5 (patch) | |
tree | 0ee484fe1bb0dbdae4333e30ad7c3c36251c1bcf /lib/gitlab/search_results.rb | |
parent | 24b282aeeaf5ba41c6b73100051eb48428787770 (diff) | |
download | gitlab-ce-56527b63e8a09e0fe4967eabf08638d853e6b2b5.tar.gz |
Ability to search milestonesmilestone_search
Diffstat (limited to 'lib/gitlab/search_results.rb')
-rw-r--r-- | lib/gitlab/search_results.rb | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/lib/gitlab/search_results.rb b/lib/gitlab/search_results.rb index 06245374bc8..2ab2d4af797 100644 --- a/lib/gitlab/search_results.rb +++ b/lib/gitlab/search_results.rb @@ -19,13 +19,15 @@ module Gitlab issues.page(page).per(per_page) when 'merge_requests' merge_requests.page(page).per(per_page) + when 'milestones' + milestones.page(page).per(per_page) else Kaminari.paginate_array([]).page(page).per(per_page) end end def total_count - @total_count ||= projects_count + issues_count + merge_requests_count + @total_count ||= projects_count + issues_count + merge_requests_count + milestones_count end def projects_count @@ -40,6 +42,10 @@ module Gitlab @merge_requests_count ||= merge_requests.count end + def milestones_count + @milestones_count ||= milestones.count + end + def empty? total_count.zero? end @@ -60,6 +66,12 @@ module Gitlab issues.order('updated_at DESC') end + def milestones + milestones = Milestone.where(project_id: limit_project_ids) + milestones = milestones.search(query) + milestones.order('updated_at DESC') + end + def merge_requests merge_requests = MergeRequest.in_projects(limit_project_ids) if query =~ /[#!](\d+)\z/ |