Add latest changes from gitlab-org/gitlab@master

5 files changed, 10 insertions, 0 deletions

diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb
index 864f9e2975a..d972d0dea28 100644
--- a/app/mailers/emails/merge_requests.rb
+++ b/app/mailers/emails/merge_requests.rb
@@ -117,3 +117,5 @@ module Emails
     end
   end
 end
+
+Emails::MergeRequests.prepend_if_ee('EE::Emails::MergeRequests')
diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb
index 8b93ead0ee6..c9a31b22207 100644
--- a/app/mailers/emails/notes.rb
+++ b/app/mailers/emails/notes.rb
@@ -69,3 +69,5 @@ module Emails
     end
   end
 end
+
+Emails::Notes.prepend_if_ee('EE::Emails::Notes')
diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb
index f81f76f67f7..4acf4a1dc4f 100644
--- a/app/mailers/emails/projects.rb
+++ b/app/mailers/emails/projects.rb
@@ -57,3 +57,5 @@ module Emails
     end
   end
 end
+
+Emails::Projects.prepend_if_ee('EE::Emails::Projects')
diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index 3683f2ea9a9..6fa1c701cd8 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -228,3 +228,5 @@ class Notify < BaseMailer
     @unsubscribe_url = unsubscribe_sent_notification_url(@sent_notification)
   end
 end
+
+Notify.prepend_if_ee('EE::Notify')
diff --git a/app/mailers/previews/notify_preview.rb b/app/mailers/previews/notify_preview.rb
index b3fab930922..3d42423ba46 100644
--- a/app/mailers/previews/notify_preview.rb
+++ b/app/mailers/previews/notify_preview.rb
@@ -210,3 +210,5 @@ class NotifyPreview < ActionMailer::Preview
     email
   end
 end
+
+NotifyPreview.prepend_if_ee('EE::Preview::NotifyPreview')