diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-07 03:35:09 -0700 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-07 03:35:09 -0700 |
| commit | 2eb76186f503410df5018765bc32337a8754159a (patch) | |
| tree | e350dd8784d09eb24160f270f54ba93e688f9445 | |
| parent | 3db47d12f2687f674064567cb6c48c7df1c03288 (diff) | |
| parent | 5fba1d95fd2901446aed8aef7f86708da1075b79 (diff) | |
| download | gitlab-ce-2eb76186f503410df5018765bc32337a8754159a.tar.gz | |
Merge pull request #5158 from tkoenig/fix-active-milestone-order
Sort active milestones by due date (upcoming first)
| -rw-r--r-- | app/controllers/projects/milestones_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/milestones_controller.rb b/app/controllers/projects/milestones_controller.rb index 39cd579cce5..3e88656cdf1 100644 --- a/app/controllers/projects/milestones_controller.rb +++ b/app/controllers/projects/milestones_controller.rb @@ -14,7 +14,7 @@ class Projects::MilestonesController < Projects::ApplicationController @milestones = case params[:f] when 'all'; @project.milestones.order("state, due_date DESC") when 'closed'; @project.milestones.closed.order("due_date DESC") - else @project.milestones.active.order("due_date DESC") + else @project.milestones.active.order("due_date ASC") end @milestones = @milestones.includes(:project) |