diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-15 15:09:01 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-15 15:09:01 +0300 |
commit | 01d2d6c8695d03440d68b262806f709b57da63b4 (patch) | |
tree | 2c01be0f6bc018df88062107b42d4b9a6289f8de /app/mailers | |
parent | 32e53ae7d739e9457ef81ba4a441a3acb4446240 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/mailers')
-rw-r--r-- | app/mailers/emails/members.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/mailers/emails/members.rb b/app/mailers/emails/members.rb index d1870065845..738794a94e7 100644 --- a/app/mailers/emails/members.rb +++ b/app/mailers/emails/members.rb @@ -150,10 +150,10 @@ module Emails end def invite_email_headers - if Gitlab.dev_env_or_com? + if Gitlab::CurrentSettings.mailgun_events_enabled? { - 'X-Mailgun-Tag' => 'invite_email', - 'X-Mailgun-Variables' => { 'invite_token' => @token }.to_json + 'X-Mailgun-Tag' => ::Members::Mailgun::INVITE_EMAIL_TAG, + 'X-Mailgun-Variables' => { ::Members::Mailgun::INVITE_EMAIL_TOKEN_KEY => @token }.to_json } else {} |