diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-07 11:44:45 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-06-07 11:44:45 +0000 |
| commit | 21469fa6b7364155c955fbef48880eb32419361d (patch) | |
| tree | f63ac0dcfe64957c31402ca28d577d6de7557ff9 | |
| parent | 66c02b3fb563c4cf3e12bb2952ca94f2b1582e78 (diff) | |
| parent | 95e41bc54bb314755486587141e977034f332b60 (diff) | |
| download | gitlab-ce-21469fa6b7364155c955fbef48880eb32419361d.tar.gz | |
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
| -rw-r--r-- | changelogs/unreleased/44790-disabled-emails-logging.yml | 5 | ||||
| -rw-r--r-- | config/initializers/disable_email_interceptor.rb | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/changelogs/unreleased/44790-disabled-emails-logging.yml b/changelogs/unreleased/44790-disabled-emails-logging.yml new file mode 100644 index 00000000000..90125dc0300 --- /dev/null +++ b/changelogs/unreleased/44790-disabled-emails-logging.yml @@ -0,0 +1,5 @@ +--- +title: Stop logging email information when emails are disabled +merge_request: 18521 +author: Marc Shaw +type: fixed 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 |