diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-12-08 23:43:11 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-12-08 23:43:11 +0300 |
commit | f66454beaa880d283ef527c3a32a3076fedf6551 (patch) | |
tree | 6852eca364013dd171727b2795de0993563af91b /app/views/projects/issues/_issue.html.haml | |
parent | 792f2bbe0b306bda266dfc817edf33b4c9e36a0f (diff) |
Add indication to merge request list item that MR cannot be merged automatically
Diffstat (limited to 'app/views/projects/issues/_issue.html.haml')
-rw-r--r-- | app/views/projects/issues/_issue.html.haml | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml index 1eb71990e55..7d9fc8d2c86 100644 --- a/app/views/projects/issues/_issue.html.haml +++ b/app/views/projects/issues/_issue.html.haml @@ -6,23 +6,26 @@ .issue-title %span.issue-title-text = link_to_gfm issue.title, issue_path(issue), class: "row_title" - .pull-right.light + %ul.controls.light - if issue.closed? - %span + %li CLOSED + - if issue.assignee - = link_to_member(@project, issue.assignee, name: false, title: "Assigned to :name") + %li + = link_to_member(@project, issue.assignee, name: false, title: "Assigned to :name") + - note_count = issue.notes.user.count - if note_count > 0 - - = link_to issue_path(issue) + "#notes" do - = icon('comments') - = note_count + %li + = link_to issue_path(issue) + "#notes" do + = icon('comments') + = note_count - else - - = link_to issue_path(issue) + "#notes", class: "issue-no-comments" do - = icon('comments') - = 0 + %li + = link_to issue_path(issue) + "#notes", class: "issue-no-comments" do + = icon('comments') + = notes_count .issue-info #{issue.to_reference} · |