diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-06-16 14:13:55 -0600 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-06-16 14:21:40 -0600 |
| commit | d032f37001ae97dcf493d9ea84c7fdc0be05bef4 (patch) | |
| tree | e0aa2a0754400d1c96e55c095cc2866d48f5f890 | |
| parent | 38d0b5b54e486a338050fcb3997fce51102de26c (diff) | |
| download | gitlab-ce-milestones-show-mrs.tar.gz | |
Add merge request data to the progress information on Milestones pages.milestones-show-mrs
Fixes #13980.
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/shared/milestones/_summary.html.haml | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG index 7f43d777b2b..a5985d3f658 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -23,6 +23,7 @@ v 8.9.0 (unreleased) - Added descriptions to notification settings dropdown - Improve note validation to prevent errors when creating invalid note via API - Reduce number of fog gem dependencies + - Add number of merge requests for a given milestone to the milestones view. - Implement a fair usage of shared runners - Remove project notification settings associated with deleted projects - Fix 404 page when viewing TODOs that contain milestones or labels in different projects diff --git a/app/views/shared/milestones/_summary.html.haml b/app/views/shared/milestones/_summary.html.haml index 385c6596606..975c74f4ea6 100644 --- a/app/views/shared/milestones/_summary.html.haml +++ b/app/views/shared/milestones/_summary.html.haml @@ -10,6 +10,13 @@ open and %strong= milestone.issues_visible_to_user(current_user).closed.size closed + %strong= milestone.merge_requests.size + merge requests: + %span.milestone-stat + %strong= milestone.merge_requests.opened.size + open and + %strong= milestone.merge_requests.merged.size + merged %span.milestone-stat %strong== #{milestone.percent_complete(current_user)}% complete |