diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-12 00:10:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-12 00:10:21 +0300 |
commit | 0ae8428c8e77d5d7e098827be688b1f146321af1 (patch) | |
tree | cfc80aac796be0dd42ce32a1bd79c8327071993d /app/mailers | |
parent | f020d5dc9bf42fe27b1451af34e7ab3a0c38d344 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/mailers')
-rw-r--r-- | app/mailers/emails/issues.rb | 2 | ||||
-rw-r--r-- | app/mailers/emails/members.rb | 2 | ||||
-rw-r--r-- | app/mailers/emails/merge_requests.rb | 2 | ||||
-rw-r--r-- | app/mailers/emails/notes.rb | 2 | ||||
-rw-r--r-- | app/mailers/emails/profile.rb | 2 | ||||
-rw-r--r-- | app/mailers/emails/projects.rb | 2 | ||||
-rw-r--r-- | app/mailers/notify.rb | 2 | ||||
-rw-r--r-- | app/mailers/previews/notify_preview.rb | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/app/mailers/emails/issues.rb b/app/mailers/emails/issues.rb index c565df1a2ee..51c4779d8cf 100644 --- a/app/mailers/emails/issues.rb +++ b/app/mailers/emails/issues.rb @@ -139,4 +139,4 @@ module Emails end end -Emails::Issues.prepend_if_ee('EE::Emails::Issues') +Emails::Issues.prepend_mod_with('Emails::Issues') diff --git a/app/mailers/emails/members.rb b/app/mailers/emails/members.rb index f4d3676dc5c..674a9bfc4eb 100644 --- a/app/mailers/emails/members.rb +++ b/app/mailers/emails/members.rb @@ -167,4 +167,4 @@ module Emails end end -Emails::Members.prepend_if_ee('EE::Emails::Members') +Emails::Members.prepend_mod_with('Emails::Members') diff --git a/app/mailers/emails/merge_requests.rb b/app/mailers/emails/merge_requests.rb index e538b5e4718..2746b8b7188 100644 --- a/app/mailers/emails/merge_requests.rb +++ b/app/mailers/emails/merge_requests.rb @@ -167,4 +167,4 @@ module Emails end end -Emails::MergeRequests.prepend_if_ee('EE::Emails::MergeRequests') +Emails::MergeRequests.prepend_mod_with('Emails::MergeRequests') diff --git a/app/mailers/emails/notes.rb b/app/mailers/emails/notes.rb index 4b56ff60f09..587c1479286 100644 --- a/app/mailers/emails/notes.rb +++ b/app/mailers/emails/notes.rb @@ -84,4 +84,4 @@ module Emails end end -Emails::Notes.prepend_if_ee('EE::Emails::Notes') +Emails::Notes.prepend_mod_with('Emails::Notes') diff --git a/app/mailers/emails/profile.rb b/app/mailers/emails/profile.rb index f967323f849..2efcba54c13 100644 --- a/app/mailers/emails/profile.rb +++ b/app/mailers/emails/profile.rb @@ -132,4 +132,4 @@ module Emails end end -Emails::Profile.prepend_if_ee('EE::Emails::Profile') +Emails::Profile.prepend_mod_with('Emails::Profile') diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb index a4b7b140169..2ae82b49609 100644 --- a/app/mailers/emails/projects.rb +++ b/app/mailers/emails/projects.rb @@ -66,4 +66,4 @@ module Emails end end -Emails::Projects.prepend_if_ee('EE::Emails::Projects') +Emails::Projects.prepend_mod_with('Emails::Projects') diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb index 5f5afef350b..dd75ab4bf03 100644 --- a/app/mailers/notify.rb +++ b/app/mailers/notify.rb @@ -223,4 +223,4 @@ class Notify < ApplicationMailer end end -Notify.prepend_if_ee('EE::Notify') +Notify.prepend_mod_with('Notify') diff --git a/app/mailers/previews/notify_preview.rb b/app/mailers/previews/notify_preview.rb index f6b1e503cb5..df0d1774d6b 100644 --- a/app/mailers/previews/notify_preview.rb +++ b/app/mailers/previews/notify_preview.rb @@ -255,4 +255,4 @@ class NotifyPreview < ActionMailer::Preview end end -NotifyPreview.prepend_if_ee('EE::Preview::NotifyPreview') +NotifyPreview.prepend_mod_with('Preview::NotifyPreview') |