diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-02-15 17:59:58 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-02-15 19:17:13 +0300 |
| commit | fd7461f8546b124a7cc03e8cab703eb405d0bb98 (patch) | |
| tree | 06b41ba4f955d140cbb0acd8e7d9c700be78599b /app | |
| parent | 80fd4ffe5381aa085f8ae140037399528a15cc49 (diff) | |
Merge branch '56332-exclude-public-group-milestones-from-count' into 'master'
Exclude public group milestones from counts in milestones dashboard
Closes #56332
See merge request gitlab-org/gitlab-ce!25230
(cherry picked from commit bd488bc29afbfdfeca5c22ab2caa926525dd666b)
0f0bf2a2 Exclude public group milestones from counts
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/dashboard/milestones_controller.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/controllers/dashboard/milestones_controller.rb b/app/controllers/dashboard/milestones_controller.rb index 9484e4d30cd..912036da0ea 100644 --- a/app/controllers/dashboard/milestones_controller.rb +++ b/app/controllers/dashboard/milestones_controller.rb @@ -25,8 +25,6 @@ class Dashboard::MilestonesController < Dashboard::ApplicationController private def group_milestones - groups = GroupsFinder.new(current_user, all_available: false).execute - DashboardGroupMilestone.build_collection(groups, params) end @@ -45,6 +43,6 @@ class Dashboard::MilestonesController < Dashboard::ApplicationController end def groups - @groups ||= GroupsFinder.new(current_user, state_all: true).execute + @groups ||= GroupsFinder.new(current_user, all_available: false).execute end end |