diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-15 15:56:14 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-15 15:56:14 +0000 |
| commit | a69cd321142c9b9b4a737160fcc254e0b163dd29 (patch) | |
| tree | 7072f5baaf5f3d78098495229ce5aa33ff778008 | |
| parent | 33b68f87803edc2b484e94e277dcaf67175340c1 (diff) | |
| parent | be04becfb39e853f17c52a25dc2e0c2f97eb9284 (diff) | |
| download | gitlab-ce-a69cd321142c9b9b4a737160fcc254e0b163dd29.tar.gz | |
Merge branch 'show_number_of_mrs_in_milestone_page' into 'master'
Show number of processed MRs in milestone page
closes #14025
See merge request !4006
| -rw-r--r-- | app/views/shared/milestones/_merge_requests_tab.haml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/shared/milestones/_merge_requests_tab.haml b/app/views/shared/milestones/_merge_requests_tab.haml index c29d8ee6737..9c193f901e2 100644 --- a/app/views/shared/milestones/_merge_requests_tab.haml +++ b/app/views/shared/milestones/_merge_requests_tab.haml @@ -3,10 +3,10 @@ .row.prepend-top-default .col-md-3 - = render 'shared/milestones/issuables', args.merge(title: 'Work in progress (open and unassigned)', issuables: merge_requests.opened.unassigned, id: 'unassigned') + = render 'shared/milestones/issuables', args.merge(title: 'Work in progress (open and unassigned)', issuables: merge_requests.opened.unassigned, id: 'unassigned', show_counter: true) .col-md-3 - = render 'shared/milestones/issuables', args.merge(title: 'Waiting for merge (open and assigned)', issuables: merge_requests.opened.assigned, id: 'ongoing') + = render 'shared/milestones/issuables', args.merge(title: 'Waiting for merge (open and assigned)', issuables: merge_requests.opened.assigned, id: 'ongoing', show_counter: true) .col-md-3 - = render 'shared/milestones/issuables', args.merge(title: 'Rejected (closed)', issuables: merge_requests.closed, id: 'closed') + = render 'shared/milestones/issuables', args.merge(title: 'Rejected (closed)', issuables: merge_requests.closed, id: 'closed', show_counter: true) .col-md-3 - = render 'shared/milestones/issuables', args.merge(title: 'Merged', issuables: merge_requests.merged, id: 'merged', primary: true) + = render 'shared/milestones/issuables', args.merge(title: 'Merged', issuables: merge_requests.merged, id: 'merged', primary: true, show_counter: true) |