Commit dd8d0a659d947df0dcaaae2960aa1567a8740b11
1 parent
d64090b8
Exists in
master
and in
4 other branches
Fix procfile and attachment in event nore
Showing
2 changed files
with
8 additions
and
7 deletions
Show diff stats
Procfile
| 1 | web: bundle exec unicorn_rails -p $PORT | 1 | web: bundle exec unicorn_rails -p $PORT |
| 2 | -worker: bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,common,default,gitolite | 2 | +worker: bundle exec sidekiq -q post_receive,mailer,system_hook,project_web_hook,common,default,gitlab_shell |
app/views/events/event/_note.html.haml
| @@ -25,9 +25,10 @@ | @@ -25,9 +25,10 @@ | ||
| 25 | %span.event-note | 25 | %span.event-note |
| 26 | = markdown truncate(event.target.note, length: 70) | 26 | = markdown truncate(event.target.note, length: 70) |
| 27 | - note = event.target | 27 | - note = event.target |
| 28 | - = link_to note.attachment.url, target: "_blank", class: 'note-file-attach' do | ||
| 29 | - - if note.attachment.image? | ||
| 30 | - = image_tag note.attachment.url, class: 'note-image-attach' | ||
| 31 | - - else | ||
| 32 | - %i.icon-paper-clip | ||
| 33 | - = note.attachment_identifier | 28 | + - if note.attachment.url |
| 29 | + = link_to note.attachment.url, target: "_blank", class: 'note-file-attach' do | ||
| 30 | + - if note.attachment.image? | ||
| 31 | + = image_tag note.attachment.url, class: 'note-image-attach' | ||
| 32 | + - else | ||
| 33 | + %i.icon-paper-clip | ||
| 34 | + = note.attachment_identifier |