summaryrefslogtreecommitdiff
path: root/app/views/shared/milestones
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-09-04 09:54:01 +0000
committerPhil Hughes <me@iamphill.com>2017-09-04 09:54:01 +0000
commitebbbc7ef52fbd1d3339e2e21be967d313a074a28 (patch)
treed68a07cff9711b4dd510b1ad29a1f93567c8ecef /app/views/shared/milestones
parentc03f7825a2ec8fd1d966d65fc664a55ae59916cc (diff)
parent641b552aa68fe9ad1c07d46b2407e2d020a9c69c (diff)
downloadgitlab-ce-ebbbc7ef52fbd1d3339e2e21be967d313a074a28.tar.gz
Merge branch '36452-milestone-icon' into 'master'
Use new MR icon for milestone sidebar Closes #36452 See merge request !14004
Diffstat (limited to 'app/views/shared/milestones')
-rw-r--r--app/views/shared/milestones/_sidebar.html.haml2
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 2ae0145727c..f03e0ab154c 100644
--- a/app/views/shared/milestones/_sidebar.html.haml
+++ b/app/views/shared/milestones/_sidebar.html.haml
@@ -88,7 +88,7 @@
.block.merge-requests
.sidebar-collapsed-icon
%strong
- = icon('exclamation', 'aria-hidden': 'true')
+ = custom_icon('mr_bold')
%span= milestone.merge_requests.count
.title.hide-collapsed
Merge requests