summaryrefslogtreecommitdiff
path: root/ee/app/mailers
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-12-11 13:58:19 +0100
committerRémy Coutable <remy@rymai.me>2018-12-11 15:13:40 +0100
commit0371858b8a488333633be4f89b085fd09900868e (patch)
tree6408defd7b8122337047473fe14f157e5b04cbdf /ee/app/mailers
parentc077a9bdc2f1acaa0b865bc589cbd52bb7b0001b (diff)
downloadgitlab-ce-0371858b8a488333633be4f89b085fd09900868e.tar.gz
Add tests for the service desk emails
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'ee/app/mailers')
-rw-r--r--ee/app/mailers/emails/service_desk.rb7
1 files changed, 3 insertions, 4 deletions
diff --git a/ee/app/mailers/emails/service_desk.rb b/ee/app/mailers/emails/service_desk.rb
index 500d6279159..cc86868bd21 100644
--- a/ee/app/mailers/emails/service_desk.rb
+++ b/ee/app/mailers/emails/service_desk.rb
@@ -11,13 +11,13 @@ module Emails
def service_desk_thank_you_email(issue_id)
setup_service_desk_mail(issue_id)
- mail_new_thread(@issue, service_desk_options(@support_bot.id))
+ mail_new_thread(@issue, service_desk_options(@support_bot.id).merge(subject: "Re: #{@issue.title} (##{@issue.iid})"))
end
def service_desk_new_note_email(issue_id, note_id)
@note = Note.find(note_id)
setup_service_desk_mail(issue_id)
- mail_answer_thread(@issue, service_desk_options(@note.author_id))
+ mail_answer_thread(@issue, service_desk_options(@note.author_id).merge(subject: "#{@issue.title} (##{@issue.iid})"))
end
private
@@ -33,8 +33,7 @@ module Emails
def service_desk_options(author_id)
{
from: sender(author_id),
- to: @issue.service_desk_reply_to,
- subject: "Re: #{@issue.title} (##{@issue.iid})"
+ to: @issue.service_desk_reply_to
}
end
end