diff options
author | Robb Kidd <robb@thekidds.org> | 2012-05-15 19:41:37 -0400 |
---|---|---|
committer | Robb Kidd <robb@thekidds.org> | 2012-05-15 22:37:34 -0400 |
commit | e660043d22bd686f6799a46b506a4c2ad53e46fa (patch) | |
tree | 5ee872899cfe68bb389d57d12826f6bf92b872ad /app/mailers | |
parent | 39061af9f8f19d114b48f79a66c22116a52e57be (diff) | |
download | gitlab-ce-e660043d22bd686f6799a46b506a4c2ad53e46fa.tar.gz |
Make Notify#new_merge_request_email resque friendly.
Diffstat (limited to 'app/mailers')
-rw-r--r-- | app/mailers/notify.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index b776878b03b..05fd17b511a 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) |