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/finders | |
| 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/finders')
| -rw-r--r-- | app/finders/issuable_finder.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb index 072d07e0ed2..6eab8c5ee51 100644 --- a/app/finders/issuable_finder.rb +++ b/app/finders/issuable_finder.rb @@ -496,7 +496,7 @@ class IssuableFinder upcoming_ids = Milestone.upcoming_ids(projects, related_groups) items = items.left_joins_milestones.where(milestone_id: upcoming_ids) elsif filter_by_started_milestone? - items = items.left_joins_milestones.where('milestones.start_date <= NOW()') + items = items.left_joins_milestones.merge(Milestone.started) else items = items.with_milestone(params[:milestone_title]) end |