diff options
author | Robb Kidd <robb@thekidds.org> | 2012-05-16 02:48:00 +0400 |
---|---|---|
committer | Robb Kidd <robb@thekidds.org> | 2012-05-16 06:37:33 +0400 |
commit | bb22360d1a7548facff3b72b2f9a0e66c6a55bb7 (patch) | |
tree | b32bea574bca56ff2b4ba8beea598376a6c26ce9 /app/views/notify | |
parent | 5fe75649b3e278562b241abadb7d5a62146cff34 (diff) |
Make Notify#note_merge_request_email resque friendly
Update method to take ids and then perform #finds itself during mailer
queue worker kick-off.
Diffstat (limited to 'app/views/notify')
-rw-r--r-- | app/views/notify/note_merge_request_email.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/notify/note_merge_request_email.html.haml b/app/views/notify/note_merge_request_email.html.haml index e2dfec35b7f..9c2284a6457 100644 --- a/app/views/notify/note_merge_request_email.html.haml +++ b/app/views/notify/note_merge_request_email.html.haml @@ -5,13 +5,13 @@ %td{:align => "left", :style => "padding: 20px 0 0;"} %h2{:style => "color:#646464; font-weight: bold; margin: 0; padding: 0; line-height: 26px; font-size: 18px; font-family: Helvetica, Arial, sans-serif; "} New comment for Merge Request - = link_to truncate(@merge_request.title, :length => 16), project_merge_request_url(@project, @merge_request, :anchor => "note_#{@note.id}") + = link_to truncate(@merge_request.title, :length => 16), project_merge_request_url(@merge_request.project, @merge_request, :anchor => "note_#{@note.id}") %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"} %tr %td{:style => "font-size: 1px; line-height: 1px;", :width => "21"} %td{:style => "padding: 15px 0 15px;", :valign => "top"} %p{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "} - %a{:href => "#", :style => "color: #0eb6ce; text-decoration: none;"} #{@note.author.name} + %a{:href => "#", :style => "color: #0eb6ce; text-decoration: none;"} #{@note.author_name} left next message: %br %table{:border => "0", :cellpadding => "0", :cellspacing => "0", :width => "558"} |