From: Robb Kidd <robb@thekidds.org>
Date: Wed, 16 May 2012 02:27:35 +0000 (-0400)
Subject: Change calls to Notify methods to send IDs instead of objects.
X-Git-Tag: v2.5.0~15^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=991d23e216cc4a847ee5724967ea69f40bb16fe8;p=wvm%2Fgitlab.git

Change calls to Notify methods to send IDs instead of objects.
---

diff --git a/app/models/mailer_observer.rb b/app/models/mailer_observer.rb
index 73920b8fe..e581ae804 100644
--- a/app/models/mailer_observer.rb
+++ b/app/models/mailer_observer.rb
@@ -18,7 +18,7 @@ class MailerObserver < ActiveRecord::Observer
 
   def new_issue(issue)
     if issue.assignee != current_user
-      Notify.new_issue_email(issue).deliver
+      Notify.new_issue_email(issue.id).deliver
     end
   end
 
@@ -32,26 +32,26 @@ class MailerObserver < ActiveRecord::Observer
       note.project.users.reject { |u| u.id == current_user.id } .each do |u|
         case note.noteable_type
         when "Commit" then
-          Notify.note_commit_email(u, note).deliver
+          Notify.note_commit_email(u.id, note.id).deliver
         when "Issue" then
-          Notify.note_issue_email(u, note).deliver
+          Notify.note_issue_email(u.id, note.id).deliver
         when "MergeRequest" then
           Notify.note_merge_request_email(u.id, note.id).deliver
         when "Snippet"
           true
         else
-          Notify.note_wall_email(u, note).deliver
+          Notify.note_wall_email(u.id, note.id).deliver
         end
       end
     # Notify only author of resource
     elsif note.notify_author
-      Notify.note_commit_email(note.commit_author, note).deliver
+      Notify.note_commit_email(note.commit_author.id, note.id).deliver
     end
   end
 
   def new_merge_request(merge_request)
     if merge_request.assignee != current_user
-      Notify.new_merge_request_email(merge_request).deliver
+      Notify.new_merge_request_email(merge_request.id).deliver
     end
   end
 
@@ -61,7 +61,7 @@ class MailerObserver < ActiveRecord::Observer
       recipients_ids.delete current_user.id
 
       User.find(recipients_ids).each do |user|
-        Notify.changed_merge_request_email(user, merge_request).deliver
+        Notify.reassigned_merge_request_email(user.id, merge_request.id, merge_request.assignee_id_was).deliver
       end
     end