From: Robb Kidd <robb@thekidds.org>
Date: Tue, 15 May 2012 23:41:37 +0000 (-0400)
Subject: Make Notify#new_merge_request_email resque friendly.
X-Git-Tag: v2.5.0~15^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e660043d22bd686f6799a46b506a4c2ad53e46fa;p=wvm%2Fgitlab.git

Make Notify#new_merge_request_email resque friendly.
---

diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index b776878b0..05fd17b51 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -45,11 +45,9 @@ class Notify < ActionMailer::Base
     mail(:to => recipient.email, :subject => "gitlab | note for issue #{@issue.id} | #{@note.project_name} ")
   end
 
-  def new_merge_request_email(merge_request)
-    @merge_request = MergeRequest.find(merge_request['id'])
-    @user = @merge_request.assignee
-    @project = @merge_request.project
-    mail(:to => @user.email, :subject => "gitlab | new merge request | #{@merge_request.title} ")
+  def new_merge_request_email(merge_request_id)
+    @merge_request = MergeRequest.find(merge_request_id)
+    mail(:to => @merge_request.assignee_email, :subject => "gitlab | new merge request | #{@merge_request.title} ")
   end
 
   def reassigned_merge_request_email(recipient_id, merge_request_id, previous_assignee_id)
diff --git a/app/views/notify/new_merge_request_email.html.haml b/app/views/notify/new_merge_request_email.html.haml
index 57c35db50..f7ec01e84 100644
--- a/app/views/notify/new_merge_request_email.html.haml
+++ b/app/views/notify/new_merge_request_email.html.haml
@@ -5,16 +5,14 @@
       %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 Merge Request
-          = link_to truncate(@merge_request.title, :length => 16), project_merge_request_url(@project, @merge_request)
+          = link_to truncate(@merge_request.title, :length => 16), project_merge_request_url(@merge_request.project, @merge_request)
       %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; "}
           Branches: #{@merge_request.source_branch} &rarr; #{@merge_request.target_branch}
-        
         %p{:style => "color:#767676; font-weight: normal; margin: 0; padding: 0; line-height: 20px; font-size: 12px;font-family: Helvetica, Arial, sans-serif; "}
-          Asignee: #{@merge_request.author.name} &rarr; #{@merge_request.assignee.name}      
-      
+          Asignee: #{@merge_request.author_name} &rarr; #{@merge_request.assignee_name}
       %td
 
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 40a514379..065094e96 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -101,7 +101,7 @@ describe Notify do
         let(:merge_request) { Factory.create(:merge_request, :assignee => assignee, :project => project) }
 
         describe 'that are new' do
-          subject { Notify.new_merge_request_email(merge_request) }
+          subject { Notify.new_merge_request_email(merge_request.id) }
 
           it_behaves_like 'an assignee email'