diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-06 19:47:27 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-10-06 19:47:27 +0300 |
| commit | a68a39e34120e0cf67d95e143326d03f61288cdf (patch) | |
| tree | d979ff0c94c6b78a4c19e55fda18b1f2c88ba852 /app/views/projects/_md_preview.html.haml | |
| parent | 8c4dea25d4b76d75d83d22b9925d784ec09b46f9 (diff) | |
| parent | 26f6065ec686d16a053e33f031779a8e75f0c5c9 (diff) | |
Merge branch '18608-lock-issues-v2' into 'master'
Resolve "Lock issue and merge request"
Closes #18608
See merge request gitlab-org/gitlab-ce!14531
Diffstat (limited to 'app/views/projects/_md_preview.html.haml')
| -rw-r--r-- | app/views/projects/_md_preview.html.haml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/views/projects/_md_preview.html.haml b/app/views/projects/_md_preview.html.haml index 71424593f2e..770608eddff 100644 --- a/app/views/projects/_md_preview.html.haml +++ b/app/views/projects/_md_preview.html.haml @@ -1,5 +1,12 @@ - referenced_users = local_assigns.fetch(:referenced_users, nil) +- if defined?(@merge_request) && @merge_request.discussion_locked? + .issuable-note-warning + = icon('lock', class: 'icon') + %span + = _('This merge request is locked.') + = _('Only project members can comment.') + .md-area .md-header %ul.nav-links.clearfix |