diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-10-09 12:52:51 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-10-09 12:52:51 +0000 |
| commit | 2409acfa7f97fef81dd66640c64e9d0008b85cde (patch) | |
| tree | 1dcafa5cd5b4646ddaf6d736cc2a15d60d0f0c19 /app/views/projects/merge_requests/_mr_title.html.haml | |
| parent | 0f366c74131339cb45c8943437fe5b3e68721c75 (diff) | |
| parent | f277fa14094e5515e2317d2baa1fa0bfb95966da (diff) | |
| download | gitlab-ce-2409acfa7f97fef81dd66640c64e9d0008b85cde.tar.gz | |
Merge branch 'master' into 'group-sort-dropdown-blank'
# Conflicts:
# spec/features/dashboard/group_spec.rb
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 9ff85c2ee4c..cb723fe6a18 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 |