44790: Disable the action mailer base logging when emails are disabled

2121e3b1 · Marc Shaw · fe0ebf76 · 2121e3b1
Commit 2121e3b1 authored Apr 18, 2018 by Marc Shaw
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

config/initializers/disable_email_interceptor.rb config/initializers/disable_email_interceptor.rb +4 -1

No files found.
--- a/config/initializers/disable_email_interceptor.rb
+++ b/config/initializers/disable_email_interceptor.rb
 # Interceptor in lib/disable_email_interceptor.rb
-ActionMailer::Base.register_interceptor(DisableEmailInterceptor) unless Gitlab.config.gitlab.email_enabled
+unless Gitlab.config.gitlab.email_enabled
+  ActionMailer::Base.register_interceptor(DisableEmailInterceptor)
+  ActionMailer::Base.logger = nil
+end