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/issues/show.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/issues/show.html.haml')
| -rw-r--r-- | app/views/projects/issues/show.html.haml | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml index fbaf88356bf..b9fec8af4d7 100644 --- a/app/views/projects/issues/show.html.haml +++ b/app/views/projects/issues/show.html.haml @@ -27,7 +27,9 @@ .issuable-meta - if @issue.confidential - = icon('eye-slash', class: 'is-confidential') + = icon('eye-slash', class: 'issuable-warning-icon') + - if @issue.discussion_locked? + = icon('lock', class: 'issuable-warning-icon') = issuable_meta(@issue, @project, "Issue") .issuable-actions.js-issuable-actions |