diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2017-10-31 23:16:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-31 23:16:14 -0400 |
| commit | 4d96be1c27bd6faed957b197a461f18543acebf2 (patch) | |
| tree | bd19322b92e55af211e063ea830402002e490c10 | |
| parent | 6f481e05bb24fe3589ef0f65e97a9b1fa66ae0f7 (diff) | |
| parent | 14b7d673a3efb676ce29f483ded84214aae6d745 (diff) | |
| download | rails-4d96be1c27bd6faed957b197a461f18543acebf2.tar.gz rails-4d96be1c27bd6faed957b197a461f18543acebf2.tar.bz2 rails-4d96be1c27bd6faed957b197a461f18543acebf2.zip | |
Merge pull request #31026 from yahonda/diag_mail27
Workaround for ActionMailer failures by not installing mail 2.7
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 1 |
2 files changed, 4 insertions, 0 deletions
@@ -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" diff --git a/Gemfile.lock b/Gemfile.lock index c333828f64..c9dd54d92a 100644 --- a/Gemfile.lock +++ b/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 |