Add latest changes from gitlab-org/gitlab@master

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
         {}