diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-28 09:09:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-28 09:09:29 +0300 |
commit | 9e16447c7c4cec7373bb2df0d94b4dc8b8300b08 (patch) | |
tree | 0e76220d9911ade344c91264c7ce0dbc67c47e9f /app/mailers/emails/members.rb | |
parent | cba9857205cea2e02cd36f3a4079b3f041e5b982 (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 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 {} |