diff options
| author | randx <dmitriy.zaporozhets@gmail.com> | 2012-06-26 21:20:05 +0300 |
|---|---|---|
| committer | randx <dmitriy.zaporozhets@gmail.com> | 2012-06-26 21:20:05 +0300 |
| commit | 283bf806766c02c8c66230f4c765070b0ed812fb (patch) | |
| tree | b5ea6418ff9b337287614f6989bf0a95d9969500 | |
| parent | 666cdb22792dd955a286b9993d6235b4cdd68b4b (diff) | |
| download | gitlab-ce-283bf806766c02c8c66230f4c765070b0ed812fb.tar.gz | |
Comment icons for Issues, MR lists
| -rw-r--r-- | app/views/issues/_show.html.haml | 4 | ||||
| -rw-r--r-- | app/views/merge_requests/_merge_request.html.haml | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml index 492cedf629b..de27555952f 100644 --- a/app/views/issues/_show.html.haml +++ b/app/views/issues/_show.html.haml @@ -3,7 +3,9 @@ .icon .right - if issue.notes.any? - %span.btn.small.disabled.padded= pluralize issue.notes.count, 'note' + %span.btn.small.disabled.padded + %i.icon-comment + = issue.notes.count - if can? current_user, :modify_issue, issue - if issue.closed = link_to 'Reopen', project_issue_path(issue.project, issue, :issue => {:closed => false }, :status_only => true), :method => :put, :class => "btn small padded", :remote => true diff --git a/app/views/merge_requests/_merge_request.html.haml b/app/views/merge_requests/_merge_request.html.haml index 794e927c2db..37108cca006 100644 --- a/app/views/merge_requests/_merge_request.html.haml +++ b/app/views/merge_requests/_merge_request.html.haml @@ -7,7 +7,9 @@ %i.icon-ok = "MERGED" - if merge_request.notes.any? - %span.btn.small.disabled.padded= pluralize merge_request.notes.count, 'note' + %span.btn.small.disabled.padded + %i.icon-comment + = merge_request.notes.count %span.btn.small.disabled.padded = merge_request.source_branch → |