diff options
| author | Valery Sizov <valery@gitlab.com> | 2016-11-30 14:53:30 +0200 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2016-11-30 14:53:30 +0200 |
| commit | 32c6c9c457d88071ad82728ea6111a2d7d31b634 (patch) | |
| tree | fe7f181e05f7268d5cdb177b05d763f5c22c3634 /app/mailers/emails/notes.rb | |
| parent | 7a155137a4fd965cb8ff512a9548a7e685b330f5 (diff) | |
| parent | 43c8788e7bd4c705bc8215ea2409b21a19d090f7 (diff) | |
| download | gitlab-ce-32c6c9c457d88071ad82728ea6111a2d7d31b634.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into bitbucket-oauth2
Diffstat (limited to 'app/mailers/emails/notes.rb')
| -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 |