summaryrefslogtreecommitdiff
path: root/app/controllers/dashboard
diff options
context:
space:
mode:
authorEagllus <rvanzon@gitlab.com>2018-10-26 13:43:28 +0200
committerEagllus <rvanzon@gitlab.com>2018-10-26 13:43:28 +0200
commit3b70cf69188b9906098df5bd984e9337f16e1080 (patch)
tree5aa88597163100d29e2afb135c30cca8a0d7d58b /app/controllers/dashboard
parent0ff5b0f45361cf9fe622cc3265b943a999c14d0e (diff)
downloadgitlab-ce-3b70cf69188b9906098df5bd984e9337f16e1080.tar.gz
Update MR based on Sean's feedbackrz_fix_milestone_count
Diffstat (limited to 'app/controllers/dashboard')
-rw-r--r--app/controllers/dashboard/milestones_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/dashboard/milestones_controller.rb b/app/controllers/dashboard/milestones_controller.rb
index 8252a0f2511..3802aa5f40f 100644
--- a/app/controllers/dashboard/milestones_controller.rb
+++ b/app/controllers/dashboard/milestones_controller.rb
@@ -10,7 +10,7 @@ class Dashboard::MilestonesController < Dashboard::ApplicationController
def index
respond_to do |format|
format.html do
- @milestone_states = Milestone.states_count(@projects, @groups)
+ @milestone_states = Milestone.states_count(@projects.select(:id), @groups.select(:id))
@milestones = Kaminari.paginate_array(milestones).page(params[:page])
end
format.json do