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

Merge pull request #3058 from lyda/4-1-stable 

Fix sending commit note email to id instead email
4-1-stable
Dmitriy Zaporozhets 2013-02-25 10:11:38 -08:00
parent db958e5997 c78ebc3ebb
commit c643fb78e2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/mailers/notify.rb
View File

@ -63,12 +63,12 @@ class Notify < ActionMailer::Base
# Note # Note
# #
def note_commit_email(commit_autor_email, note_id) def note_commit_email(recipient_id, note_id)
@note = Note.find(note_id) @note = Note.find(note_id)
@commit = @note.noteable @commit = @note.noteable
@commit = CommitDecorator.decorate(@commit) @commit = CommitDecorator.decorate(@commit)
@project = @note.project @project = @note.project
mail(to: commit_autor_email, subject: subject("note for commit #{@commit.short_id}", @commit.title)) mail(to: recipient(recipient_id), subject: subject("note for commit #{@commit.short_id}", @commit.title))
end end
def note_issue_email(recipient_id, note_id) def note_issue_email(recipient_id, note_id)

2
app/observers/note_observer.rb
View File

@ -11,7 +11,7 @@ class NoteObserver < ActiveRecord::Observer
notify_team(note) notify_team(note)
elsif note.notify_author elsif note.notify_author
# Notify only author of resource # Notify only author of resource
Notify.delay.note_commit_email(note.noteable.author_email, note.id) Notify.delay.note_commit_email(note.commit_author.id, note.id)
else else
# Otherwise ignore it # Otherwise ignore it
nil nil