summaryrefslogtreecommitdiff
path: root/app/mailers/emails/service_desk.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-12-17 11:59:07 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-12-17 11:59:07 +0000
commit8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch)
tree544930fb309b30317ae9797a9683768705d664c4 /app/mailers/emails/service_desk.rb
parent4b1de649d0168371549608993deac953eb692019 (diff)
downloadgitlab-ce-8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca.tar.gz
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'app/mailers/emails/service_desk.rb')
-rw-r--r--app/mailers/emails/service_desk.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/mailers/emails/service_desk.rb b/app/mailers/emails/service_desk.rb
index fa646487819..4dceff5b7ba 100644
--- a/app/mailers/emails/service_desk.rb
+++ b/app/mailers/emails/service_desk.rb
@@ -47,7 +47,7 @@ module Emails
def service_desk_options(email_sender, email_type)
{
from: email_sender,
- to: @issue.service_desk_reply_to
+ to: @issue.external_author
}.tap do |options|
next unless template_body = template_content(email_type)