diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-17 03:08:37 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-17 03:08:37 +0300 |
commit | cd7ea53ba94f20c09b88614d2c17662972d8ce4d (patch) | |
tree | d930e0c89f6951343c7566ff70edba047e4385c0 /app/mailers | |
parent | b7f59cf951f4610ff712358f1675183989fb5d2a (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 738794a94e7..d1870065845 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::CurrentSettings.mailgun_events_enabled? + if Gitlab.dev_env_or_com? { - 'X-Mailgun-Tag' => ::Members::Mailgun::INVITE_EMAIL_TAG, - 'X-Mailgun-Variables' => { ::Members::Mailgun::INVITE_EMAIL_TOKEN_KEY => @token }.to_json + 'X-Mailgun-Tag' => 'invite_email', + 'X-Mailgun-Variables' => { 'invite_token' => @token }.to_json } else {} |