summaryrefslogtreecommitdiff
path: root/app/mailers
diff options
context:
space:
mode:
authorRobb Kidd <robb@thekidds.org>2012-05-15 19:21:12 -0400
committerRobb Kidd <robb@thekidds.org>2012-05-15 22:37:34 -0400
commit41c00a20a97e7ee3764822249d4bedc538c515aa (patch)
tree82e1b361b6a9a87b8ae93623fd10f46fe826c5ff /app/mailers
parent0a9a2c2a0b75ba617611382b6335bf2b7fc68b9f (diff)
downloadgitlab-ce-41c00a20a97e7ee3764822249d4bedc538c515aa.tar.gz
Make Notify#note_wall_email resque friendly
Update method to take ids and then perform #finds itself during mailer queue worker kick-off.
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/notify.rb9
1 files changed, 4 insertions, 5 deletions
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index 1fa1a2b8ebc..bb46ba04f08 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -21,11 +21,10 @@ class Notify < ActionMailer::Base
mail(:to => @user.email, :subject => "gitlab | New Issue was created")
end
- def note_wall_email(user, note)
- @user = user
- @note = Note.find(note['id'])
- @project = @note.project
- mail(:to => @user['email'], :subject => "gitlab | #{@note.project.name} ")
+ def note_wall_email(recipient_id, note_id)
+ recipient = User.find(recipient_id)
+ @note = Note.find(note_id)
+ mail(:to => recipient.email, :subject => "gitlab | #{@note.project.name} ")
end
def note_commit_email(recipient_id, note_id)