summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-02-11 19:25:06 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-02-11 19:25:06 +0200
commitdd8d0a659d947df0dcaaae2960aa1567a8740b11 (patch)
treef2e55e7edce75f6ec09f7e066a9f5ce4d6d4f178
parentd64090b8a9065746c6d532057228c079a1d57013 (diff)
downloadgitlab-ce-dd8d0a659d947df0dcaaae2960aa1567a8740b11.tar.gz
Fix procfile and attachment in event nore
-rw-r--r--Procfile2
-rw-r--r--app/views/events/event/_note.html.haml13
2 files changed, 8 insertions, 7 deletions
diff --git a/Procfile b/Procfile
index 1a4145cc7d3..66ca562f131 100644
--- a/Procfile
+++ b/Procfile
@@ -1,2 +1,2 @@
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
diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml
index ac380a9a5e3..20c3b927067 100644
--- a/app/views/events/event/_note.html.haml
+++ b/app/views/events/event/_note.html.haml
@@ -25,9 +25,10 @@
%span.event-note
= markdown truncate(event.target.note, length: 70)
- note = event.target
- = link_to note.attachment.url, target: "_blank", class: 'note-file-attach' do
- - if note.attachment.image?
- = image_tag note.attachment.url, class: 'note-image-attach'
- - else
- %i.icon-paper-clip
- = note.attachment_identifier
+ - if note.attachment.url
+ = link_to note.attachment.url, target: "_blank", class: 'note-file-attach' do
+ - if note.attachment.image?
+ = image_tag note.attachment.url, class: 'note-image-attach'
+ - else
+ %i.icon-paper-clip
+ = note.attachment_identifier