diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-27 16:10:32 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-04-27 16:10:32 +0000 |
commit | 976b020aa3666ac9f1bd302e5b9bdfbe54f28fac (patch) | |
tree | e1f5ed5a817b49cb3ca9f71ed564d4607e60fb44 /app | |
parent | 4d4aefc561bc5a9462dc68db8715b96c6c86bbca (diff) | |
parent | 55fd112bcc92683f1d602d9173399bcf236a061c (diff) | |
download | gitlab-ce-976b020aa3666ac9f1bd302e5b9bdfbe54f28fac.tar.gz |
Merge branch '31292-milestone-sidebar-display-incorect-number-of-mr-when-minimized' into 'master'
Resolve "Milestone sidebar display incorect number of MR when minimized"
Closes #31292
See merge request !10933
Diffstat (limited to 'app')
-rw-r--r-- | app/views/shared/milestones/_sidebar.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/milestones/_sidebar.html.haml b/app/views/shared/milestones/_sidebar.html.haml index ccc808ff43e..774d20fb5ba 100644 --- a/app/views/shared/milestones/_sidebar.html.haml +++ b/app/views/shared/milestones/_sidebar.html.haml @@ -89,7 +89,7 @@ .sidebar-collapsed-icon %strong = icon('exclamation', 'aria-hidden': 'true') - %span= milestone.issues_visible_to_user(current_user).count + %span= milestone.merge_requests.count .title.hide-collapsed Merge requests %span.badge= milestone.merge_requests.count |