diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 23:50:22 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-20 23:50:22 +0000 |
| commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
| tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /app/mailers/emails/in_product_marketing.rb | |
| parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) | |
| download | gitlab-ce-9dc93a4519d9d5d7be48ff274127136236a3adb3.tar.gz | |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to 'app/mailers/emails/in_product_marketing.rb')
| -rw-r--r-- | app/mailers/emails/in_product_marketing.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/mailers/emails/in_product_marketing.rb b/app/mailers/emails/in_product_marketing.rb index 0be9ec5f915..d21c3d13b10 100644 --- a/app/mailers/emails/in_product_marketing.rb +++ b/app/mailers/emails/in_product_marketing.rb @@ -4,8 +4,10 @@ module Emails module InProductMarketing include InProductMarketingHelper - FROM_ADDRESS = 'GitLab <team@gitlab.com>'.freeze + FROM_ADDRESS = 'GitLab <team@gitlab.com>' CUSTOM_HEADERS = { + from: FROM_ADDRESS, + reply_to: FROM_ADDRESS, 'X-Mailgun-Track' => 'yes', 'X-Mailgun-Track-Clicks' => 'yes', 'X-Mailgun-Track-Opens' => 'yes', @@ -25,7 +27,8 @@ module Emails private def mail_to(to:, subject:) - mail(to: to, subject: subject, from: FROM_ADDRESS, reply_to: FROM_ADDRESS, **CUSTOM_HEADERS) do |format| + custom_headers = Gitlab.com? ? CUSTOM_HEADERS : {} + mail(to: to, subject: subject, **custom_headers) do |format| format.html { render layout: nil } format.text { render layout: nil } end |