From 33709d437b0f0c085699aaf82243fc04db5b64e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Fri, 18 May 2018 14:47:53 +0200
Subject: [PATCH] Minimize CE/EE diff in Notify
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 app/mailers/notify.rb                    |  6 +---
 ee/app/mailers/ee/notify.rb              |  4 +++
 ee/app/mailers/emails/ee/service_desk.rb | 41 ------------------------
 ee/app/mailers/emails/service_desk.rb    | 39 ++++++++++++++++++++++
 4 files changed, 44 insertions(+), 46 deletions(-)
 delete mode 100644 ee/app/mailers/emails/ee/service_desk.rb
 create mode 100644 ee/app/mailers/emails/service_desk.rb

diff --git a/app/mailers/notify.rb b/app/mailers/notify.rb
index e31f2b97650..be72a942145 100644
--- a/app/mailers/notify.rb
+++ b/app/mailers/notify.rb
@@ -1,12 +1,10 @@
 class Notify < BaseMailer
-  prepend EE::Notify
+  prepend ::EE::Notify
 
   include ActionDispatch::Routing::PolymorphicRoutes
   include GitlabRoutingHelper
 
-  include Emails::AdminNotification
   include Emails::Issues
-  include Emails::CsvExport
   include Emails::MergeRequests
   include Emails::Notes
   include Emails::PagesDomains
@@ -15,8 +13,6 @@ class Notify < BaseMailer
   include Emails::Pipelines
   include Emails::Members
 
-  include Emails::EE::ServiceDesk
-
   helper MergeRequestsHelper
   helper DiffHelper
   helper BlobHelper
diff --git a/ee/app/mailers/ee/notify.rb b/ee/app/mailers/ee/notify.rb
index 6469c26e376..c555bf433cb 100644
--- a/ee/app/mailers/ee/notify.rb
+++ b/ee/app/mailers/ee/notify.rb
@@ -4,6 +4,10 @@ module EE
     extend ::Gitlab::Utils::Override
 
     included do
+      include ::Emails::AdminNotification
+      include ::Emails::CsvExport
+      include ::Emails::ServiceDesk
+
       attr_reader :group
     end
 
diff --git a/ee/app/mailers/emails/ee/service_desk.rb b/ee/app/mailers/emails/ee/service_desk.rb
deleted file mode 100644
index 3a1d35b4d26..00000000000
--- a/ee/app/mailers/emails/ee/service_desk.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-module Emails
-  module EE
-    module ServiceDesk
-      extend ActiveSupport::Concern
-
-      included do
-        layout 'service_desk', only: [:service_desk_thank_you_email, :service_desk_new_note_email]
-      end
-
-      def service_desk_thank_you_email(issue_id)
-        setup_service_desk_mail(issue_id)
-
-        mail_new_thread(@issue, service_desk_options(@support_bot.id))
-      end
-
-      def service_desk_new_note_email(issue_id, note_id)
-        @note = Note.find(note_id)
-        setup_service_desk_mail(issue_id)
-        mail_answer_thread(@issue, service_desk_options(@note.author_id))
-      end
-
-      private
-
-      def setup_service_desk_mail(issue_id)
-        @issue = Issue.find(issue_id)
-        @project = @issue.project
-        @support_bot = User.support_bot
-
-        @sent_notification = SentNotification.record(@issue, @support_bot.id, reply_key)
-      end
-
-      def service_desk_options(author_id)
-        {
-          from: sender(author_id),
-          to: @issue.service_desk_reply_to,
-          subject: "Re: #{@issue.title} (##{@issue.iid})"
-        }
-      end
-    end
-  end
-end
diff --git a/ee/app/mailers/emails/service_desk.rb b/ee/app/mailers/emails/service_desk.rb
new file mode 100644
index 00000000000..3d50b1fea55
--- /dev/null
+++ b/ee/app/mailers/emails/service_desk.rb
@@ -0,0 +1,39 @@
+module Emails
+  module ServiceDesk
+    extend ActiveSupport::Concern
+
+    included do
+      layout 'service_desk', only: [:service_desk_thank_you_email, :service_desk_new_note_email]
+    end
+
+    def service_desk_thank_you_email(issue_id)
+      setup_service_desk_mail(issue_id)
+
+      mail_new_thread(@issue, service_desk_options(@support_bot.id))
+    end
+
+    def service_desk_new_note_email(issue_id, note_id)
+      @note = Note.find(note_id)
+      setup_service_desk_mail(issue_id)
+      mail_answer_thread(@issue, service_desk_options(@note.author_id))
+    end
+
+    private
+
+    def setup_service_desk_mail(issue_id)
+      @issue = Issue.find(issue_id)
+      @project = @issue.project
+      @support_bot = User.support_bot
+
+      @sent_notification = SentNotification.record(@issue, @support_bot.id, reply_key)
+    end
+
+    def service_desk_options(author_id)
+      {
+        from: sender(author_id),
+        to: @issue.service_desk_reply_to,
+        subject: "Re: #{@issue.title} (##{@issue.iid})"
+      }
+    end
+  end
+end
-- 
2.30.9