Add latest changes from gitlab-org/gitlab@master

2 files changed, 36 insertions, 0 deletions

diff --git a/app/mailers/emails/in_product_marketing.rb b/app/mailers/emails/in_product_marketing.rb
new file mode 100644
index 00000000000..0be9ec5f915
--- /dev/null
+++ b/app/mailers/emails/in_product_marketing.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Emails
+  module InProductMarketing
+    include InProductMarketingHelper
+
+    FROM_ADDRESS = 'GitLab <team@gitlab.com>'.freeze
+    CUSTOM_HEADERS = {
+      'X-Mailgun-Track' => 'yes',
+      'X-Mailgun-Track-Clicks' => 'yes',
+      'X-Mailgun-Track-Opens' => 'yes',
+      'X-Mailgun-Tag' => 'marketing'
+    }.freeze
+
+    def in_product_marketing_email(recipient_id, group_id, track, series)
+      @track = track
+      @series = series
+      @group = Group.find(group_id)
+
+      email = User.find(recipient_id).notification_email_for(@group)
+      subject = subject_line(track, series)
+      mail_to(to: email, subject: subject)
+    end
+
+    private
+
+    def mail_to(to:, subject:)
+      mail(to: to, subject: subject, from: FROM_ADDRESS, reply_to: FROM_ADDRESS, **CUSTOM_HEADERS) do |format|
+        format.html { render layout: nil }
+        format.text { render layout: nil }
+      end
+    end
+  end
+end
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index ebf6dd68ec7..8f947ea7113 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -21,6 +21,7 @@ class Notify < ApplicationMailer
   include Emails::Groups
   include Emails::Reviews
   include Emails::ServiceDesk
+  include Emails::InProductMarketing
 
   helper TimeboxesHelper
   helper MergeRequestsHelper
@@ -32,6 +33,7 @@ class Notify < ApplicationMailer
   helper AvatarsHelper
   helper GitlabRoutingHelper
   helper IssuablesHelper
+  helper InProductMarketingHelper
 
   def test_email(recipient_email, subject, body)
     mail(to: recipient_email,