Move all EE mailer differences to EE specific modules
EE specific code that resides in app/mailers
should be moved to the
corresponding EE specific modules that reside in ee/app/mailers
, leaving
behind only the necessary prepend
and include
calls, which should be placed
at the end of the file).
Differences
app/mailers/emails/projects.rb
diff --git a/home/yorickpeterse/Projects/gitlab/gdk-ce/gitlab/app/mailers/emails/projects.rb b/home/yorickpeterse/Projects/gitlab/gdk-ee/gitlab/app/mailers/emails/projects.rb
index d7e6c2ba7b2..f079694ccc1 100644
--- a/home/yorickpeterse/Projects/gitlab/gdk-ce/gitlab/app/mailers/emails/projects.rb
+++ b/home/yorickpeterse/Projects/gitlab/gdk-ee/gitlab/app/mailers/emails/projects.rb
@@ -2,6 +2,8 @@
module Emails
module Projects
+ prepend Emails::EE::Projects
+
def project_was_moved_email(project_id, user_id, old_path_with_namespace)
@current_user = @user = User.find user_id
@project = Project.find project_id
app/mailers/emails/merge_requests.rb
diff --git a/home/yorickpeterse/Projects/gitlab/gdk-ce/gitlab/app/mailers/emails/merge_requests.rb b/home/yorickpeterse/Projects/gitlab/gdk-ee/gitlab/app/mailers/emails/merge_requests.rb
index 6524d0c2087..2b3d6e1c44d 100644
--- a/home/yorickpeterse/Projects/gitlab/gdk-ce/gitlab/app/mailers/emails/merge_requests.rb
+++ b/home/yorickpeterse/Projects/gitlab/gdk-ee/gitlab/app/mailers/emails/merge_requests.rb
@@ -2,6 +2,8 @@
module Emails
module MergeRequests
+ prepend Emails::EE::MergeRequests
+
def new_merge_request_email(recipient_id, merge_request_id, reason = nil)
setup_merge_request_mail(merge_request_id, recipient_id, present: true)
app/mailers/emails/notes.rb
diff --git a/home/yorickpeterse/Projects/gitlab/gdk-ce/gitlab/app/mailers/emails/notes.rb b/home/yorickpeterse/Projects/gitlab/gdk-ee/gitlab/app/mailers/emails/notes.rb
index d3284e90568..a11b6b41e61 100644
--- a/home/yorickpeterse/Projects/gitlab/gdk-ce/gitlab/app/mailers/emails/notes.rb
+++ b/home/yorickpeterse/Projects/gitlab/gdk-ee/gitlab/app/mailers/emails/notes.rb
@@ -2,6 +2,8 @@
module Emails
module Notes
+ prepend Emails::EE::Notes
+
def note_commit_email(recipient_id, note_id)
setup_note_mail(note_id, recipient_id)