diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-20 18:09:18 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-20 18:09:18 +0300 |
| commit | 364f6f2e33e6f5eafe63b25d9256b88e72141b1c (patch) | |
| tree | ee6dc003a354e7466d5c45e5587c0f8172312122 /config/initializers/action_mailer_hooks.rb | |
| parent | 98252e0dd60cbcb316231085e206d9872f243b8a (diff) | |
Add latest changes from gitlab-org/gitlab@master
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" |