diff options
| author | jessib <jessib@leap.se> | 2013-01-17 10:39:15 -0800 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2013-01-17 10:39:15 -0800 |
| commit | 7d7741f7d26c3ae7ee1dc347a6b1a1142a3c2824 (patch) | |
| tree | 5ec11b9600d4330ec94f56dda779634cd7dcae1b /help/app/views/tickets/_comment.html.haml | |
| parent | 2485527650c4832d764d318e91c10bafde8b8ae5 (diff) | |
| parent | b550cd14f33b9664fe6b547dc56107fae7d12caf (diff) | |
Merge branch 'master' into feature/unauthenticated_tickets
Conflicts:
help/app/views/tickets/_comment.html.haml
help/app/views/tickets/_new_comment.html.haml
Diffstat (limited to 'help/app/views/tickets/_comment.html.haml')
| -rw-r--r-- | help/app/views/tickets/_comment.html.haml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/help/app/views/tickets/_comment.html.haml b/help/app/views/tickets/_comment.html.haml index 01cf01a..501ceec 100644 --- a/help/app/views/tickets/_comment.html.haml +++ b/help/app/views/tickets/_comment.html.haml @@ -7,7 +7,8 @@ = 'Posted by' + (comment.posted_by_user.is_admin? ? ' admin' : '') + ':' = comment.posted_by_user.login - else - Unauthenticated post + %b + Unauthenticated post - if comment.private (Private comment) .pull-right @@ -15,4 +16,5 @@ Posted at: = comment.posted_at.to_s(:short) %br - = comment.body
\ No newline at end of file + = comment.body + |