Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/mailers/emails/in_product_marketing.rb')
-rw-r--r--app/mailers/emails/in_product_marketing.rb7
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