deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'dev' into new_layout

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
app/views/notes/_show.html.haml
View file

@ -2,7 +2,7 @@
%div.note_author
= image_tag gravatar_icon(note.author.email), :class => "left", :width => 40, :style => "padding-right:5px;"
%div.note_content.left
= simple_format(html_escape(note.note))
= markdown(note.note)
- if note.attachment.url
Attachment:
= link_to note.attachment_identifier, note.attachment.url, :target => "_blank"

2
app/views/projects/_recent_messages.html.haml
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: