Merge branch 'fix-milestone-upcoming' into 'master'

Fix Milestone.upcoming The order wasn't happening because of `default_scope`. Blegh. See merge request !3364

Merge branch 'fix-milestone-upcoming' into 'master'
1f5d5af4 · Robert Speicher · 384a82f1 · b651a4fd · 1f5d5af4
Commit 1f5d5af4 authored Mar 23, 2016 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

milestone.rb app/models/milestone.rb +1 -1

No files found.
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -83,7 +83,7 @@ class Milestone < ActiveRecord::Base
  end

  def self.upcoming
-    self.where('due_date > ?', Time.now).order(due_date: :asc).first
+    self.where('due_date > ?', Time.now).reorder(due_date: :asc).first
  end

  def to_reference(from_project = nil)