Add latest changes from gitlab-org/gitlab@15-10-stable-ee

1 files changed, 4 insertions, 0 deletions

diff --git a/Gemfile b/Gemfile
index 15995b07e1f..a8063691b7e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -546,6 +546,10 @@ gem 'lru_redux'
 # Locked as long as quoted-printable encoding issues are not resolved
 # Monkey-patched in `config/initializers/mail_encoding_patch.rb`
 # See https://gitlab.com/gitlab-org/gitlab/issues/197386
+#
+# `config/initializers/mail_starttls_patch.rb` has also been patched to
+# fix STARTTLS handling until https://github.com/mikel/mail/pull/1536 is
+# released.
 gem 'mail', '= 2.8.1'
 gem 'mail-smtp_pool', '~> 0.1.0', path: 'vendor/gems/mail-smtp_pool', require: false