diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-03-11 14:15:05 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-03-19 14:28:30 +0000 |
| commit | 222199f67032306aa318cab3f09f4be1d5c7e731 (patch) | |
| tree | 3917231bda5da39507db995eb6ff5075db641f9f /app/models/milestone.rb | |
| parent | 8d067414f5112be1a8e927ba06fad0abc989038f (diff) | |
| download | gitlab-ce-222199f67032306aa318cab3f09f4be1d5c7e731.tar.gz | |
Only count active milestones as started
The Upcoming milestone filter only considers active milestones, but the
Started one included closed milestones, too. This was inconsistent.
Diffstat (limited to 'app/models/milestone.rb')
| -rw-r--r-- | app/models/milestone.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/milestone.rb b/app/models/milestone.rb index d6f94cad1fb..a3831ae3fa8 100644 --- a/app/models/milestone.rb +++ b/app/models/milestone.rb @@ -37,6 +37,7 @@ class Milestone < ActiveRecord::Base scope :active, -> { with_state(:active) } scope :closed, -> { with_state(:closed) } scope :for_projects, -> { where(group: nil).includes(:project) } + scope :started, -> { active.where('milestones.start_date <= CURRENT_DATE') } scope :for_projects_and_groups, -> (projects, groups) do projects = projects.compact if projects.is_a? Array |