Commit 21469fa6 authored by Sean McGivern's avatar Sean McGivern
Browse files

Merge branch '44790-disabled-emails-logging' into 'master'

Stop logging email information when emails are disabled

Closes #44790

See merge request gitlab-org/gitlab-ce!18521
parents 66c02b3f 95e41bc5
---
title: Stop logging email information when emails are disabled
merge_request: 18521
author: Marc Shaw
type: fixed
# 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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment