diff options
Diffstat (limited to 'config/initializers/action_mailer_hooks.rb')
-rw-r--r-- | config/initializers/action_mailer_hooks.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/initializers/action_mailer_hooks.rb b/config/initializers/action_mailer_hooks.rb index 02ca6ef13bf..41e34b6eb20 100644 --- a/config/initializers/action_mailer_hooks.rb +++ b/config/initializers/action_mailer_hooks.rb @@ -11,6 +11,9 @@ ActionMailer::Base.register_interceptors( ActionMailer::Base.register_observer(::Gitlab::Email::Hook::DeliveryMetricsObserver) +# Force premailer loading so that it's not configured to run after the S/MIME interceptor +::Premailer::Rails.register_interceptors + if Gitlab.config.gitlab.email_enabled && Gitlab.config.gitlab.email_smime.enabled ActionMailer::Base.register_interceptor(::Gitlab::Email::Hook::SmimeSignatureInterceptor) Gitlab::AppLogger.debug "S/MIME signing of outgoing emails enabled" |