Add latest changes from gitlab-org/gitlab@13-0-stable-ee

1 files changed, 12 insertions, 0 deletions

diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb
index 6dd4ccb510a..4b56ff60f09 100644
--- a/app/mailers/emails/notes.rb
+++ b/app/mailers/emails/notes.rb
@@ -40,6 +40,18 @@ module Emails
       mail_answer_note_thread(@snippet, @note, note_thread_options(recipient_id, reason))
     end
 
+    def note_design_email(recipient_id, note_id, reason = nil)
+      setup_note_mail(note_id, recipient_id)
+
+      design = @note.noteable
+      @target_url = ::Gitlab::Routing.url_helpers.designs_project_issue_url(
+        @note.resource_parent,
+        design.issue,
+        note_target_url_query_params.merge(vueroute: design.filename)
+      )
+      mail_answer_note_thread(design, @note, note_thread_options(recipient_id, reason))
+    end
+
     private
 
     def note_target_url_options