diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-12-07 13:45:16 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-12-07 13:45:16 +0100 |
| commit | a468bf346af9f86b4a9e5d3ba027e0debad948cc (patch) | |
| tree | 3e29605eee1ae4bcb5a7b6a4e3af5216732843e1 /app/helpers | |
| parent | 359d94607c2df324bc5cd9591bded05dbe9ca157 (diff) | |
| parent | ff08ce9ca4bef1a4f81f7a4b323614a639efe959 (diff) | |
| download | gitlab-ce-a468bf346af9f86b4a9e5d3ba027e0debad948cc.tar.gz | |
Merge branch 'gsmethells/gitlab-ce-sort-by-due-date'
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/milestones_helper.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/helpers/milestones_helper.rb b/app/helpers/milestones_helper.rb index ad43892b639..a42cbcff182 100644 --- a/app/helpers/milestones_helper.rb +++ b/app/helpers/milestones_helper.rb @@ -28,7 +28,9 @@ module MilestonesHelper Milestone.where(project_id: @projects) end.active + epoch = DateTime.parse('1970-01-01') grouped_milestones = GlobalMilestone.build_collection(milestones) + grouped_milestones = grouped_milestones.sort_by { |x| x.due_date.nil? ? epoch : x.due_date } grouped_milestones.unshift(Milestone::None) grouped_milestones.unshift(Milestone::Any) |