summaryrefslogtreecommitdiff
path: root/app/helpers/milestones_helper.rb
diff options
context:
space:
mode:
authorGreg Smethells <smethells@icloud.com>2015-11-30 14:47:44 -0600
committerGreg Smethells <smethells@icloud.com>2015-12-03 08:53:34 -0600
commitdbbd2b863b402e460ac1dc90f852fcae617a2351 (patch)
tree64f4c67ede3405ee0b4a53bceeb8f6cf5ca8e126 /app/helpers/milestones_helper.rb
parent76b2250c60c410121cccaea584ca5345fa30e69b (diff)
downloadgitlab-ce-dbbd2b863b402e460ac1dc90f852fcae617a2351.tar.gz
sort milestones by due_date
Diffstat (limited to 'app/helpers/milestones_helper.rb')
-rw-r--r--app/helpers/milestones_helper.rb2
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)