diff options
author | Valery Sizov <valery@gitlab.com> | 2016-12-02 10:23:14 +0300 |
---|---|---|
committer | Valery Sizov <valery@gitlab.com> | 2016-12-02 10:23:14 +0300 |
commit | d6e7c693c17609ae0e8471aa63cc621d76eccb5d (patch) | |
tree | bbf51376969417538dae7e9c5e70354cb3a9b8fa /app/mailers | |
parent | 726ae97f57ddfa631f60d3b8f97c21f236de5821 (diff) | |
parent | 14046b9c734e5e6506d63276f39f3f9d770c3699 (diff) |
Merge CE to EE with all the conflicts [ckip ci]
Diffstat (limited to 'app/mailers')
-rw-r--r-- | app/mailers/emails/notes.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb index 96116e916dd..0d20c9092c4 100644 --- a/app/mailers/emails/notes.rb +++ b/app/mailers/emails/notes.rb @@ -4,6 +4,7 @@ module Emails setup_note_mail(note_id, recipient_id) @commit = @note.noteable + @discussion = @note.to_discussion if @note.diff_note? @target_url = namespace_project_commit_url(*note_target_url_options) mail_answer_thread(@commit, @@ -24,6 +25,7 @@ module Emails setup_note_mail(note_id, recipient_id) @merge_request = @note.noteable + @discussion = @note.to_discussion if @note.diff_note? @target_url = namespace_project_merge_request_url(*note_target_url_options) mail_answer_thread(@merge_request, note_thread_options(recipient_id)) end |