Merge branch 'dev' into new_layout

This commit is contained in:
gitlabhq 2011-10-31 13:11:46 +03:00
commit fb33ccd87f
5 changed files with 10 additions and 3 deletions

View file

@ -40,7 +40,7 @@
%p{:style => "margin-bottom: 3px;"}
%span.author
= note.author.name
= link_to truncate(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: