summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-03 14:29:31 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-05-03 14:29:31 +0300
commite097812f5778b87fc7fd285908e1ab47ff523c91 (patch)
treed307b880f72f76752c2590bbdde963165c9c8966 /app/helpers
parent644b4c97e94a0d5009e0af659c8e3f3921fc336a (diff)
parente6ee8d0ebebc217e247558507eac619931a47121 (diff)
downloadgitlab-ce-e097812f5778b87fc7fd285908e1ab47ff523c91.tar.gz
Merge pull request #9234 from dsander/group-milestones-by-title
Group milestones by title in the dashboard and all other issue views
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/milestones_helper.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb
index 282bdf744d2..93e33ebefd8 100644
--- a/app/helpers/milestones_helper.rb
+++ b/app/helpers/milestones_helper.rb
@@ -28,6 +28,7 @@ module MilestonesHelper
Milestone.where(project_id: @projects)
end.active
- options_from_collection_for_select(milestones, 'id', 'title', params[:milestone_id])
+ grouped_milestones = Milestones::GroupService.new(milestones).execute
+ options_from_collection_for_select(grouped_milestones, 'title', 'title', params[:milestone_title])
end
end