diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-09-14 14:01:07 +0300 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-09-14 16:10:41 +0300 |
| commit | a319418d9c050097a797fbf4f890cebd5256ed43 (patch) | |
| tree | d1c97d9139fa984c8c8a86c5bdbe5c6438e6831b /app/views/projects/merge_requests/_mr_title.html.haml | |
| parent | 994e7d135947ca162c147c5e0992a0190de22808 (diff) | |
Merge FE
Diffstat (limited to 'app/views/projects/merge_requests/_mr_title.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/_mr_title.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/projects/merge_requests/_mr_title.html.haml b/app/views/projects/merge_requests/_mr_title.html.haml index f3c44c94a5c..4033e00f538 100644 --- a/app/views/projects/merge_requests/_mr_title.html.haml +++ b/app/views/projects/merge_requests/_mr_title.html.haml @@ -15,6 +15,8 @@ = icon('angle-double-left') .issuable-meta + - if @merge_request.discussion_locked + = icon('lock', class: 'issuable-warning-icon') = issuable_meta(@merge_request, @project, "Merge request") .issuable-actions.js-issuable-actions |