deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source
This commit is contained in:
Robb Kidd 2012-05-15 22:27:35 -04:00
parent e660043d22
commit 991d23e216
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/models/mailer_observer.rb
View file

@ -18,7 +18,7 @@ class MailerObserver < ActiveRecord::Observer
def new_issue(issue) def new_issue(issue)
if issue.assignee != current_user if issue.assignee != current_user
Notify.new_issue_email(issue).deliver Notify.new_issue_email(issue.id).deliver
end end
end end
@ -32,26 +32,26 @@ class MailerObserver < ActiveRecord::Observer
note.project.users.reject { |u| u.id == current_user.id } .each do |u| note.project.users.reject { |u| u.id == current_user.id } .each do |u|
case note.noteable_type case note.noteable_type
when "Commit" then when "Commit" then
Notify.note_commit_email(u, note).deliver Notify.note_commit_email(u.id, note.id).deliver
when "Issue" then when "Issue" then
Notify.note_issue_email(u, note).deliver Notify.note_issue_email(u.id, note.id).deliver
when "MergeRequest" then when "MergeRequest" then
Notify.note_merge_request_email(u.id, note.id).deliver Notify.note_merge_request_email(u.id, note.id).deliver
when "Snippet" when "Snippet"
true true
else else
Notify.note_wall_email(u, note).deliver Notify.note_wall_email(u.id, note.id).deliver
end end
end end
# Notify only author of resource # Notify only author of resource
elsif note.notify_author 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
end end
def new_merge_request(merge_request) def new_merge_request(merge_request)
if merge_request.assignee != current_user 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
end end
@ -61,7 +61,7 @@ class MailerObserver < ActiveRecord::Observer
recipients_ids.delete current_user.id recipients_ids.delete current_user.id
User.find(recipients_ids).each do |user| 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
end end