aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYasuo Honda <yasuo.honda@gmail.com>2017-11-01 02:40:34 +0000
committerYasuo Honda <yasuo.honda@gmail.com>2017-11-01 02:47:57 +0000
commit14b7d673a3efb676ce29f483ded84214aae6d745 (patch)
treebd19322b92e55af211e063ea830402002e490c10
parent6f481e05bb24fe3589ef0f65e97a9b1fa66ae0f7 (diff)
downloadrails-14b7d673a3efb676ce29f483ded84214aae6d745.tar.gz
rails-14b7d673a3efb676ce29f483ded84214aae6d745.tar.bz2
rails-14b7d673a3efb676ce29f483ded84214aae6d745.zip
Workaround for ActionMailer failures by not installing mail 2.7
```ruby TestHelperMailerTest#test_encode BaseTest#test_implicit_multipart_with_attachments_creates_nested_parts BaseTest#test_implicit_multipart_with_attachments_and_sort_order BaseTest#test_explicit_multipart_with_attachments_creates_nested_parts ``` Refer https://travis-ci.org/rails/rails/jobs/295571582
-rw-r--r--Gemfile3
-rw-r--r--Gemfile.lock1
2 files changed, 4 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 2704e1e806..1a1b1584e8 100644
--- a/Gemfile
+++ b/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"
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