summaryrefslogtreecommitdiff
path: root/app/mailers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-12-10 21:08:01 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-12-10 21:08:01 +0000
commit4ba55564e1dd7fdbdb89065be8eefd01d8c2d607 (patch)
tree32e6eaec4cf44b40607e3fd8c4077050c3ce9771 /app/mailers
parent115c8ea7af7ef69ca3f09c333314546e9b5712f9 (diff)
downloadgitlab-ce-4ba55564e1dd7fdbdb89065be8eefd01d8c2d607.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/mailers')
-rw-r--r--app/mailers/emails/notes.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb
index a1c8c3455b5..de70d0073b3 100644
--- a/app/mailers/emails/notes.rb
+++ b/app/mailers/emails/notes.rb
@@ -38,7 +38,7 @@ module Emails
setup_note_mail(note_id, recipient_id)
@snippet = @note.noteable
- @target_url = snippet_url(@note.noteable)
+ @target_url = gitlab_snippet_url(@note.noteable)
mail_answer_note_thread(@snippet, @note, note_thread_options(recipient_id, reason))
end