diff options
author | Nihad Abbasov <narkoz.2008@gmail.com> | 2011-10-31 13:49:33 +0400 |
---|---|---|
committer | Nihad Abbasov <narkoz.2008@gmail.com> | 2011-10-31 13:49:33 +0400 |
commit | ded7d08d70348b7ad75699e438a2f91377c20cd7 (patch) | |
tree | c51fc3a5546d611097ee237a81dbe8c90eab1143 | |
parent | 406076731ec23eb52b52c03fba606aa60cc72926 (diff) | |
parent | 31280cd4cb733d25f2644788931e498eca86c477 (diff) | |
download | gitlab-ce-ded7d08d70348b7ad75699e438a2f91377c20cd7.tar.gz |
Merge branch 'refs/heads/markdown_notes' into dev
-rw-r--r-- | app/views/projects/_recent_messages.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/_recent_messages.html.haml b/app/views/projects/_recent_messages.html.haml index b38ba4831b5..e5fb28b9eac 100644 --- a/app/views/projects/_recent_messages.html.haml +++ b/app/views/projects/_recent_messages.html.haml @@ -40,7 +40,7 @@ %p{:style => "margin-bottom: 3px;"} %span.author = note.author.name - = link_to truncate(markdown(note.note), :length => 200), link_to_item + "#note_#{note.id}" + = link_to markdown(truncate(note.note, :length => 200)), link_to_item + "#note_#{note.id}" - if note.attachment.url %br Attachment: |