Merge branch 'refs/heads/markdown_notes' into dev

Nihad Abbasov
2 parents 40607673 31280cd4
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
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:
...	...	@@ -40,7 +40,7 @@
40	40	%p{:style => "margin-bottom: 3px;"}
41	41	%span.author
42	42	= note.author.name
43		- = link_to truncate(markdown(note.note), :length => 200), link_to_item + "#note_#{note.id}"
	43	+ = link_to markdown(truncate(note.note, :length => 200)), link_to_item + "#note_#{note.id}"
44	44	- if note.attachment.url
45	45	%br
46	46	Attachment:
...	...