diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-11-16 16:44:16 +0000 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-11-16 16:44:16 +0000 |
commit | d0f7e4df349b8095eb6ea9d7b6b9b234e0c5dd58 (patch) | |
tree | bd1d6c40ff93f2418a5bb6f8edfaa30ecbccbe3b /app/views/projects/merge_requests | |
parent | c5720382e67b18258c71d717c0e8073cc322b308 (diff) | |
download | gitlab-ce-d0f7e4df349b8095eb6ea9d7b6b9b234e0c5dd58.tar.gz |
Resolve "lock/confidential issuable sidebar custom svg icons iteration"
Diffstat (limited to 'app/views/projects/merge_requests')
-rw-r--r-- | app/views/projects/merge_requests/_mr_title.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/_mr_title.html.haml b/app/views/projects/merge_requests/_mr_title.html.haml index 72d5c4961ec..75b3db7e505 100644 --- a/app/views/projects/merge_requests/_mr_title.html.haml +++ b/app/views/projects/merge_requests/_mr_title.html.haml @@ -16,7 +16,7 @@ .issuable-meta - if @merge_request.discussion_locked? - = icon('lock', class: 'issuable-warning-icon') + .issuable-warning-icon.inline= sprite_icon('lock', size: 16, css_class: 'icon') = issuable_meta(@merge_request, @project, "Merge request") .issuable-actions.js-issuable-actions |