Skip to content

[15.10] Patch mail gem to handle TLS settings properly

Stan Hu requested to merge sh-backport-mail-patch-15-10 into 15-10-stable-ee

What does this MR do and why?

This backports !116925 (merged) to the 15-10-stable-ee branch.

While https://github.com/mikel/mail/pull/1526 made it possible to disable STARTTLS with Ruby 3, there were a number of logic errors that were fixed in https://github.com/mikel/mail/pull/1536.

We pull in those changes so that existing users don't have to modify their configurations to omit tls and ssl settings to disable STARTTLS.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

  • This MR is backporting a bug fix, documentation update, or spec fix, previously merged in the default branch.
  • The original MR has been deployed to GitLab.com (not applicable for documentation or spec changes).
  • This MR has a severity label assigned (if applicable).
  • This MR has been approved by a maintainer (only one approval is required).
  • Ensure the e2e:package-and-test-ee job has either succeeded or been approved by a Software Engineer in Test.

Note to the merge request author and maintainer

The process of backporting bug fixes into stable branches is tracked as part of an internal pilot. If you have questions about this process, please:

Edited by Jan Provaznik

Merge request reports