Move existing email interceptors into the same module

3 files changed, 43 insertions, 0 deletions

diff --git a/lib/gitlab/email/hook/additional_headers_interceptor.rb b/lib/gitlab/email/hook/additional_headers_interceptor.rb
new file mode 100644
index 00000000000..064cb5e659a
--- /dev/null
+++ b/lib/gitlab/email/hook/additional_headers_interceptor.rb
@@ -0,0 +1,12 @@
+module Gitlab
+  module Email
+    module Hook
+      class AdditionalHeadersInterceptor
+        def self.delivering_email(message)
+          message.header['Auto-Submitted'] ||= 'auto-generated'
+          message.header['X-Auto-Response-Suppress'] ||= 'All'
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/email/hook/disable_email_interceptor.rb b/lib/gitlab/email/hook/disable_email_interceptor.rb
new file mode 100644
index 00000000000..7bb8b53f0c8
--- /dev/null
+++ b/lib/gitlab/email/hook/disable_email_interceptor.rb
@@ -0,0 +1,13 @@
+module Gitlab
+  module Email
+    module Hook
+      class DisableEmailInterceptor
+        def self.delivering_email(message)
+          message.perform_deliveries = false
+
+          Rails.logger.info "Emails disabled! Interceptor prevented sending mail #{message.subject}"
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/email/hook/email_template_interceptor.rb b/lib/gitlab/email/hook/email_template_interceptor.rb
new file mode 100644
index 00000000000..be0c4dd862e
--- /dev/null
+++ b/lib/gitlab/email/hook/email_template_interceptor.rb
@@ -0,0 +1,18 @@
+module Gitlab
+  module Email
+    module Hook
+      class EmailTemplateInterceptor
+        ##
+        # Remove HTML part if HTML emails are disabled.
+        #
+        def self.delivering_email(message)
+          unless Gitlab::CurrentSettings.html_emails_enabled
+            message.parts.delete_if do |part|
+              part.content_type.start_with?('text/html')
+            end
+          end
+        end
+      end
+    end
+  end
+end