diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-03-23 15:51:29 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-03-29 12:18:10 +0200 |
| commit | 62600ec3912664228407d2a5ffd79af9de08eb54 (patch) | |
| tree | 236787bf2d729282c88ffe26b18e386d2a91fa1b | |
| parent | 5f9595bbd5fb4c7eb3fcf505b6666f9967e7795f (diff) | |
| download | gitlab-ce-62600ec3912664228407d2a5ffd79af9de08eb54.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-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/models/milestone.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 682900f9f59..9798e9d6cdf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,6 +8,7 @@ v 8.6.2 - Make dropdowns pixel perfect. !3337 - Fix bold text in issuable sidebar. !3358 - Fix error with anonymous token in applications settings. !3362 + - Fix the milestone 'upcoming' filter. !3364 v 8.6.1 - Add option to reload the schema before restoring a database backup. !2807 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) |