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

This commit is contained in:
Marc Shaw 2018-04-18 23:22:53 +12:00
parent fe0ebf76c4
commit 2121e3b15f

View file

@ -1,2 +1,5 @@
# 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