diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-14 08:33:13 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-03-14 08:33:13 +0000 |
| commit | 1957dde410fbb68fe6abda72cc9d036816c6a634 (patch) | |
| tree | e14fc1ebe372cca445a3e866ceb3a8a35db93ce2 /app/controllers | |
| parent | b0905366b01f1fb8633da90b489045684181602d (diff) | |
| parent | 50a8f16e165d45bf6b518c0e250e1f5a360a6d3f (diff) | |
| download | gitlab-ce-1957dde410fbb68fe6abda72cc9d036816c6a634.tar.gz | |
Merge branch 'adam-count-badges-group-dashboard-milestones' into 'master'
Add count badges to both dashboard and group milestones
Closes #24421
See merge request !9836
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/dashboard/milestones_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/groups/milestones_controller.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/dashboard/milestones_controller.rb b/app/controllers/dashboard/milestones_controller.rb index 7f506db583f..df528d10f6e 100644 --- a/app/controllers/dashboard/milestones_controller.rb +++ b/app/controllers/dashboard/milestones_controller.rb @@ -5,6 +5,7 @@ class Dashboard::MilestonesController < Dashboard::ApplicationController def index respond_to do |format| format.html do + @milestone_states = GlobalMilestone.states_count(@projects) @milestones = Kaminari.paginate_array(milestones).page(params[:page]) end format.json do diff --git a/app/controllers/groups/milestones_controller.rb b/app/controllers/groups/milestones_controller.rb index 0d872c86c8a..43102596201 100644 --- a/app/controllers/groups/milestones_controller.rb +++ b/app/controllers/groups/milestones_controller.rb @@ -6,6 +6,7 @@ class Groups::MilestonesController < Groups::ApplicationController def index respond_to do |format| format.html do + @milestone_states = GlobalMilestone.states_count(@projects) @milestones = Kaminari.paginate_array(milestones).page(params[:page]) end end |