1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30

diff --git a/app/controllers/milestones_controller.rb b/app/controllers/milestones_controller.rb
index 25647f9..1b3d11b 100644
--- a/app/controllers/milestones_controller.rb
+++ b/app/controllers/milestones_controller.rb
@@ -12,9 +12,9 @@ class MilestonesController < ProjectResourceController

 def index
 @milestones = case params[:f]
-when 'all'; @project.milestones.order("state, due_date DESC")
+when 'all'; @project.milestones.order("state, due_date ASC")
 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)
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index dc5aa6e..33a1cca 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -29,7 +29,7 @@ module IssuesHelper
 end

 def issues_active_milestones
-@project.milestones.active.order("id desc").all
+@project.milestones.active.order("due_date ASC").all
 end

 def url_for_project_issues