Commit 991d23e216cc4a847ee5724967ea69f40bb16fe8
1 parent
e660043d
Exists in
master
and in
4 other branches
Change calls to Notify methods to send IDs instead of objects.
Showing
1 changed file
with
7 additions
and
7 deletions
Show diff stats
app/models/mailer_observer.rb
| @@ -18,7 +18,7 @@ class MailerObserver < ActiveRecord::Observer | @@ -18,7 +18,7 @@ class MailerObserver < ActiveRecord::Observer | ||
| 18 | 18 | ||
| 19 | def new_issue(issue) | 19 | def new_issue(issue) |
| 20 | if issue.assignee != current_user | 20 | if issue.assignee != current_user |
| 21 | - Notify.new_issue_email(issue).deliver | 21 | + Notify.new_issue_email(issue.id).deliver |
| 22 | end | 22 | end |
| 23 | end | 23 | end |
| 24 | 24 | ||
| @@ -32,26 +32,26 @@ class MailerObserver < ActiveRecord::Observer | @@ -32,26 +32,26 @@ class MailerObserver < ActiveRecord::Observer | ||
| 32 | note.project.users.reject { |u| u.id == current_user.id } .each do |u| | 32 | note.project.users.reject { |u| u.id == current_user.id } .each do |u| |
| 33 | case note.noteable_type | 33 | case note.noteable_type |
| 34 | when "Commit" then | 34 | when "Commit" then |
| 35 | - Notify.note_commit_email(u, note).deliver | 35 | + Notify.note_commit_email(u.id, note.id).deliver |
| 36 | when "Issue" then | 36 | when "Issue" then |
| 37 | - Notify.note_issue_email(u, note).deliver | 37 | + Notify.note_issue_email(u.id, note.id).deliver |
| 38 | when "MergeRequest" then | 38 | when "MergeRequest" then |
| 39 | Notify.note_merge_request_email(u.id, note.id).deliver | 39 | Notify.note_merge_request_email(u.id, note.id).deliver |
| 40 | when "Snippet" | 40 | when "Snippet" |
| 41 | true | 41 | true |
| 42 | else | 42 | else |
| 43 | - Notify.note_wall_email(u, note).deliver | 43 | + Notify.note_wall_email(u.id, note.id).deliver |
| 44 | end | 44 | end |
| 45 | end | 45 | end |
| 46 | # Notify only author of resource | 46 | # Notify only author of resource |
| 47 | elsif note.notify_author | 47 | elsif note.notify_author |
| 48 | - Notify.note_commit_email(note.commit_author, note).deliver | 48 | + Notify.note_commit_email(note.commit_author.id, note.id).deliver |
| 49 | end | 49 | end |
| 50 | end | 50 | end |
| 51 | 51 | ||
| 52 | def new_merge_request(merge_request) | 52 | def new_merge_request(merge_request) |
| 53 | if merge_request.assignee != current_user | 53 | if merge_request.assignee != current_user |
| 54 | - Notify.new_merge_request_email(merge_request).deliver | 54 | + Notify.new_merge_request_email(merge_request.id).deliver |
| 55 | end | 55 | end |
| 56 | end | 56 | end |
| 57 | 57 | ||
| @@ -61,7 +61,7 @@ class MailerObserver < ActiveRecord::Observer | @@ -61,7 +61,7 @@ class MailerObserver < ActiveRecord::Observer | ||
| 61 | recipients_ids.delete current_user.id | 61 | recipients_ids.delete current_user.id |
| 62 | 62 | ||
| 63 | User.find(recipients_ids).each do |user| | 63 | User.find(recipients_ids).each do |user| |
| 64 | - Notify.changed_merge_request_email(user, merge_request).deliver | 64 | + Notify.reassigned_merge_request_email(user.id, merge_request.id, merge_request.assignee_id_was).deliver |
| 65 | end | 65 | end |
| 66 | end | 66 | end |
| 67 | 67 |