diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-03 06:11:19 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-03 06:11:19 +0300 |
commit | ef354fba59ddfcebdb2f539064e55d95d27e15b8 (patch) | |
tree | 638b383fdfffdef25522a50036f3532bdd6636d2 /app/mailers/emails/members.rb | |
parent | ff92da4f3468c342862dbcd5b69c01e86e2bcc3d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/mailers/emails/members.rb')
-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 53b38cc5972..6954fd46850 100644 --- a/app/mailers/emails/members.rb +++ b/app/mailers/emails/members.rb @@ -164,10 +164,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 {} |