diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-31 06:53:49 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-31 06:53:49 +0300 |
| commit | 616d6dc767ba33148a11768f3d73504368897ee9 (patch) | |
| tree | d629c921f8362af41533d8b6ca464cb4290824e7 /config | |
| parent | f4653343ad8475d1d72a55de4face443cc7f66c2 (diff) | |
Add latest changes from gitlab-org/gitlab@15-10-stable-ee
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/action_mailer_hooks.rb | 1 | ||||
| -rw-r--r-- | config/initializers/mail_encoding_patch.rb | 18 |
2 files changed, 1 insertions, 18 deletions
diff --git a/config/initializers/action_mailer_hooks.rb b/config/initializers/action_mailer_hooks.rb index fb09ed34bf6..46d5e387d9d 100644 --- a/config/initializers/action_mailer_hooks.rb +++ b/config/initializers/action_mailer_hooks.rb @@ -8,7 +8,6 @@ end ActionMailer::Base.register_interceptors( ::Gitlab::Email::Hook::AdditionalHeadersInterceptor, ::Gitlab::Email::Hook::EmailTemplateInterceptor, - ::Gitlab::Email::Hook::ValidateAddressesInterceptor, ::Gitlab::Email::Hook::DeliveryMetricsObserver ) diff --git a/config/initializers/mail_encoding_patch.rb b/config/initializers/mail_encoding_patch.rb index f72d4814856..7447cd26dcd 100644 --- a/config/initializers/mail_encoding_patch.rb +++ b/config/initializers/mail_encoding_patch.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -# Monkey patch mail 2.7.1 to fix quoted-printable issues with newlines +# Monkey patch mail 2.8.1 to fix quoted-printable issues with newlines # The issues upstream invalidate SMIME signatures under some conditions # This was working properly in 2.6.6 # @@ -8,22 +8,6 @@ # See https://github.com/mikel/mail/issues/1190 module Mail - module Encodings - # PATCH - # This reverts https://github.com/mikel/mail/pull/1113, which solves some - # encoding issues with binary attachments encoded in quoted-printable, but - # unfortunately breaks re-encoding of messages - class QuotedPrintable < SevenBit - def self.decode(str) - ::Mail::Utilities.to_lf str.gsub(/(?:=0D=0A|=0D|=0A)\r\n/, "\r\n").unpack1("M*") - end - - def self.encode(str) - ::Mail::Utilities.to_crlf([::Mail::Utilities.to_lf(str)].pack("M")) - end - end - end - class Body def encoded(transfer_encoding = nil, charset = nil) # PATCH |