diff options
| author | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-07-16 11:23:15 +0200 |
|---|---|---|
| committer | Grzegorz Bizon <grzesiek.bizon@gmail.com> | 2018-07-16 11:23:15 +0200 |
| commit | e682d941807f176ceeb8a639dc498b25560e853e (patch) | |
| tree | db1c974617b73a416cc44ddf917e446b79377433 /config | |
| parent | fabf6a5634fa5d3c585d01a0d0dfac6c39dcbe8e (diff) | |
| download | gitlab-ce-e682d941807f176ceeb8a639dc498b25560e853e.tar.gz | |
Move existing email interceptors into the same module
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/additional_headers_interceptor.rb | 3 | ||||
| -rw-r--r-- | config/initializers/disable_email_interceptor.rb | 3 | ||||
| -rw-r--r-- | config/initializers/email_template_interceptor.rb | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/config/initializers/additional_headers_interceptor.rb b/config/initializers/additional_headers_interceptor.rb index b9159e7c06c..fe4db2d3819 100644 --- a/config/initializers/additional_headers_interceptor.rb +++ b/config/initializers/additional_headers_interceptor.rb @@ -1 +1,2 @@ -ActionMailer::Base.register_interceptor(AdditionalEmailHeadersInterceptor) +ActionMailer::Base + .register_interceptor(::Gitlab::Email::Hook::AdditionalHeadersInterceptor) diff --git a/config/initializers/disable_email_interceptor.rb b/config/initializers/disable_email_interceptor.rb index e8770c8d460..72d6c4a53c1 100644 --- a/config/initializers/disable_email_interceptor.rb +++ b/config/initializers/disable_email_interceptor.rb @@ -1,5 +1,4 @@ -# Interceptor in lib/disable_email_interceptor.rb unless Gitlab.config.gitlab.email_enabled - ActionMailer::Base.register_interceptor(DisableEmailInterceptor) + ActionMailer::Base.register_interceptor(::Gitlab::Email::Hook::DisableEmailInterceptor) ActionMailer::Base.logger = nil end diff --git a/config/initializers/email_template_interceptor.rb b/config/initializers/email_template_interceptor.rb index f195ca9bcd6..dfa8a69b1f3 100644 --- a/config/initializers/email_template_interceptor.rb +++ b/config/initializers/email_template_interceptor.rb @@ -1,2 +1 @@ -# Interceptor in lib/email_template_interceptor.rb -ActionMailer::Base.register_interceptor(EmailTemplateInterceptor) +ActionMailer::Base.register_interceptor(::Gitlab::Email::Hook::EmailTemplateInterceptor) |