diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-07-18 18:04:43 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-07-18 18:04:43 +0000 |
| commit | 0b859d2f4fb3c7595f343fda0caa7dfc6919462b (patch) | |
| tree | b6ccfbc948d3327fa99b31b12bc7d891e1854255 /app | |
| parent | 53c0c4335a737068ddd57639b85028a88effa946 (diff) | |
| parent | 622e20766c6e7762e621c386dea7d3b45d4930b1 (diff) | |
| download | gitlab-ce-0b859d2f4fb3c7595f343fda0caa7dfc6919462b.tar.gz | |
Merge branch 'group-milestones-dashboard-blunceford' into 'master'
Fix bug in dashboard display of closed milestones
Closes #59381
See merge request gitlab-org/gitlab-ce!30820
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/dashboard_group_milestone.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/dashboard_group_milestone.rb b/app/models/dashboard_group_milestone.rb index 74aa04ab7d0..ec52f1ed370 100644 --- a/app/models/dashboard_group_milestone.rb +++ b/app/models/dashboard_group_milestone.rb @@ -15,8 +15,7 @@ class DashboardGroupMilestone < GlobalMilestone milestones = Milestone.of_groups(groups.select(:id)) .reorder_by_due_date_asc .order_by_name_asc - .active milestones = milestones.search_title(params[:search_title]) if params[:search_title].present? - milestones.map { |m| new(m) } + Milestone.filter_by_state(milestones, params[:state]).map { |m| new(m) } end end |