Skip to content
Snippets Groups Projects
Commit c643fb78 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

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

Fix sending commit note email to id instead email
parents db958e59 c78ebc3e
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -63,12 +63,12 @@ class Notify < ActionMailer::Base
# Note
#
 
def note_commit_email(commit_autor_email, note_id)
def note_commit_email(recipient_id, note_id)
@note = Note.find(note_id)
@commit = @note.noteable
@commit = CommitDecorator.decorate(@commit)
@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
 
def note_issue_email(recipient_id, note_id)
Loading
Loading
Loading
Loading
@@ -11,7 +11,7 @@ class NoteObserver < ActiveRecord::Observer
notify_team(note)
elsif note.notify_author
# 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
# Otherwise ignore it
nil
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment