diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-23 15:51:29 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-03-23 15:51:29 +0000 |
| commit | 1f5d5af4233e51350976b3aca62e059345089231 (patch) | |
| tree | 5578647767a768ad182b06d4ee7a90ba86220f38 | |
| parent | 384a82f1a321d1edecd312d0c124785370212edf (diff) | |
| parent | b651a4fd410749642af7a0b658ef2e60a3f45ac9 (diff) | |
| download | gitlab-ce-1f5d5af4233e51350976b3aca62e059345089231.tar.gz | |
Merge branch 'fix-milestone-upcoming' into 'master'
Fix Milestone.upcoming
The order wasn't happening because of `default_scope`. Blegh.
See merge request !3364
| -rw-r--r-- | app/models/milestone.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/milestone.rb b/app/models/milestone.rb index de7183bf6b4..bbd59eab9ae 100644 --- 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) |