diff options
| author | Marc Shaw <marc.shaw@fluxfederation.com> | 2018-04-18 14:22:53 +0300 |
|---|---|---|
| committer | Marc Shaw <marc.shaw@fluxfederation.com> | 2018-06-03 03:37:16 +0300 |
| commit | 2121e3b15f0e65e322e8f14690159e2e07905849 (patch) | |
| tree | ef2234dcdd00ebc70164259a4817102b9a30511a /config | |
| parent | fe0ebf76c49e2512b211c5d43152275c536f7e3a (diff) | |
44790: Disable the action mailer base logging when emails are disabled
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/disable_email_interceptor.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config/initializers/disable_email_interceptor.rb b/config/initializers/disable_email_interceptor.rb index c76a6b8b19f..e8770c8d460 100644 --- a/config/initializers/disable_email_interceptor.rb +++ b/config/initializers/disable_email_interceptor.rb @@ -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 |