diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-25 11:26:32 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-25 11:26:32 +0000 |
commit | 7afe79fb767086a993f13aa40e6d9ffb2d8bd9ef (patch) | |
tree | 25e2b5fcf8fc43b4401b54bb172cfa36644d0694 /app/mailers | |
parent | 1e64882da165bc872f5ce487775addf7347779f2 (diff) | |
parent | 0c350b79395d6712c7c4fee649cdbd77aa4052cc (diff) | |
download | gitlab-ce-7afe79fb767086a993f13aa40e6d9ffb2d8bd9ef.tar.gz |
Merge branch 'no_project_notes' into 'master'
Support notes without a project (personal snippets notes)
See merge request !8468
Diffstat (limited to 'app/mailers')
-rw-r--r-- | app/mailers/emails/notes.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb index 0d20c9092c4..46fa6fd9f6d 100644 --- a/app/mailers/emails/notes.rb +++ b/app/mailers/emails/notes.rb @@ -38,6 +38,14 @@ module Emails mail_answer_thread(@snippet, note_thread_options(recipient_id)) end + def note_personal_snippet_email(recipient_id, note_id) + setup_note_mail(note_id, recipient_id) + + @snippet = @note.noteable + @target_url = snippet_url(@note.noteable) + mail_answer_thread(@snippet, note_thread_options(recipient_id)) + end + private def note_target_url_options |