diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-10-29 10:23:46 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-10-29 10:23:46 +0000 |
| commit | fcd2f35b501e478b5d747890cd1887514ba7582a (patch) | |
| tree | e1d40d4baf7aa5be6dac5dcd21e9a58dc736ad1a /app/controllers/groups | |
| parent | 5a460397a1ff9456e8bb85cf1938aed1e0c35722 (diff) | |
| parent | 3b70cf69188b9906098df5bd984e9337f16e1080 (diff) | |
| download | gitlab-ce-fcd2f35b501e478b5d747890cd1887514ba7582a.tar.gz | |
Merge branch 'rz_fix_milestone_count' into 'master'
Fixing count on Milestones
Closes #50848
See merge request gitlab-org/gitlab-ce!21446
Diffstat (limited to 'app/controllers/groups')
| -rw-r--r-- | app/controllers/groups/milestones_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb index a7cee426cf1..b42116b0f36 100644 --- a/app/controllers/groups/milestones_controller.rb +++ b/app/controllers/groups/milestones_controller.rb @@ -10,7 +10,7 @@ class Groups::MilestonesController < Groups::ApplicationController def index respond_to do |format| format.html do - @milestone_states = GlobalMilestone.states_count(group_projects, group) + @milestone_states = Milestone.states_count(group_projects, [group]) @milestones = Kaminari.paginate_array(milestones).page(params[:page]) end format.json do |