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

Fix procfile and attachment in event nore

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-02-11 19:25:06 +02:00
parent d64090b8a9
commit dd8d0a659d
2 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Procfile
View file

@ -1,2 +1,2 @@
web: bundle exec unicorn_rails -p $PORT web: bundle exec unicorn_rails -p $PORT
worker: bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,common,default,gitolite worker: bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,common,default,gitlab_shell

13
app/views/events/event/_note.html.haml
View file

@ -25,9 +25,10 @@
%span.event-note %span.event-note
= markdown truncate(event.target.note, length: 70) = markdown truncate(event.target.note, length: 70)
- note = event.target - note = event.target
= link_to note.attachment.url, target: "_blank", class: 'note-file-attach' do - if note.attachment.url
- if note.attachment.image? = link_to note.attachment.url, target: "_blank", class: 'note-file-attach' do
= image_tag note.attachment.url, class: 'note-image-attach' - if note.attachment.image?
- else = image_tag note.attachment.url, class: 'note-image-attach'
%i.icon-paper-clip - else
= note.attachment_identifier %i.icon-paper-clip
= note.attachment_identifier