diff options
| author | Greg Smethells <smethells@icloud.com> | 2015-11-30 14:47:44 -0600 |
|---|---|---|
| committer | Greg Smethells <smethells@icloud.com> | 2015-12-03 08:53:34 -0600 |
| commit | dbbd2b863b402e460ac1dc90f852fcae617a2351 (patch) | |
| tree | 64f4c67ede3405ee0b4a53bceeb8f6cf5ca8e126 /app/controllers/concerns | |
| parent | 76b2250c60c410121cccaea584ca5345fa30e69b (diff) | |
| download | gitlab-ce-dbbd2b863b402e460ac1dc90f852fcae617a2351.tar.gz | |
sort milestones by due_date
Diffstat (limited to 'app/controllers/concerns')
| -rw-r--r-- | app/controllers/concerns/global_milestones.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/concerns/global_milestones.rb b/app/controllers/concerns/global_milestones.rb index b428249acd3..3e4c0e63601 100644 --- a/app/controllers/concerns/global_milestones.rb +++ b/app/controllers/concerns/global_milestones.rb @@ -2,8 +2,10 @@ module GlobalMilestones extend ActiveSupport::Concern def milestones + epoch = DateTime.parse('1970-01-01') @milestones = MilestonesFinder.new.execute(@projects, params) @milestones = GlobalMilestone.build_collection(@milestones) + @milestones = @milestones.sort_by { |x| x.due_date.nil? ? epoch : x.due_date } @milestones = Kaminari.paginate_array(@milestones).page(params[:page]).per(ApplicationController::PER_PAGE) end |