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/controllers | |
| 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/controllers')
| -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 |