Fix procfile and attachment in event nore

dd8d0a65 · Dmitriy Zaporozhets · d64090b8 · dd8d0a65 · dd8d0a65
Commit dd8d0a65 authored Feb 11, 2013 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 7 deletions

Procfile Procfile +1 -1

app/views/events/event/_note.html.haml app/views/events/event/_note.html.haml +7 -6

No files found.
--- a/Procfile
+++ b/Procfile
 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
--- 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.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