Merge pull request #31026 from yahonda/diag_mail27

Workaround for ActionMailer failures by not installing mail 2.7

Gemfile

@@ -168,3 +168,6 @@ end
 gem "ibm_db" if ENV["IBM_DB"]
 gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 gem "wdm", ">= 0.1.0", platforms: [:mingw, :mswin, :x64_mingw, :mswin64]
+
+# Workaround not to install mail 2.7
+gem "mail", ">= 2.5.4", "< 2.7"

Gemfile.lock

@@ -545,6 +545,7 @@ DEPENDENCIES
   kindlerb (~> 1.2.0)
   libxml-ruby
   listen (>= 3.0.5, < 3.2)
+  mail (>= 2.5.4, < 2.7)
   mini_magick
   minitest-bisect
   mocha