diff options
| author | Cindy Pallares <cindy@gitlab.com> | 2018-11-28 19:04:15 +0000 |
|---|---|---|
| committer | Cindy Pallares <cindy@gitlab.com> | 2018-11-28 19:11:56 -0500 |
| commit | e122e14ac6a25c7813ca888a97bd4a3298e78d9d (patch) | |
| tree | bd3774fae0517a63dd1e30b3fc95c00c54878357 /app/mailers | |
| parent | ffd1c4cd453043448198d4a1c9582f5c54f5c377 (diff) | |
| download | gitlab-ce-e122e14ac6a25c7813ca888a97bd4a3298e78d9d.tar.gz | |
Merge branch 'security-guest-comments' into 'master'
[master]Fixed ability to comment on and edit/delete comments on locked or confidential issues
See merge request gitlab/gitlabhq!2612
Diffstat (limited to 'app/mailers')
| -rw-r--r-- | app/mailers/emails/notes.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb index d3284e90568..1b3c1f9a8a9 100644 --- a/app/mailers/emails/notes.rb +++ b/app/mailers/emails/notes.rb @@ -26,7 +26,7 @@ module Emails mail_answer_note_thread(@merge_request, @note, note_thread_options(recipient_id)) end - def note_snippet_email(recipient_id, note_id) + def note_project_snippet_email(recipient_id, note_id) setup_note_mail(note_id, recipient_id) @snippet = @note.noteable |