aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/actionmailer.gemspec
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2016-01-24 12:34:05 -0500
committerRafael Mendonça França <rafaelmfranca@gmail.com>2016-01-24 12:34:05 -0500
commit9e6969412bc97494298930143c7e6e6b1434827b (patch)
tree7c4b752132af30a5ddc5f0aed4712c150cc9828d /actionmailer/actionmailer.gemspec
parent323ec89aabc43180b6463d87028f468fb27fe8bc (diff)
downloadrails-9e6969412bc97494298930143c7e6e6b1434827b.tar.gz
rails-9e6969412bc97494298930143c7e6e6b1434827b.tar.bz2
rails-9e6969412bc97494298930143c7e6e6b1434827b.zip
Revert "Merge pull request #23218 from karlfreeman/bump_mail"
This reverts commit 62aa850fee2070ec3e2d9e4f925dfd7790d27b5e, reversing changes made to 8c1f248c58ba65a786ae295def325c8982e7f431. There is no reason to disallow mail 2.5 so we don't need to bump the version constraint since people are still able to use mail 2.6 and get all the memory saving that was pointed in the pull request description.
Diffstat (limited to 'actionmailer/actionmailer.gemspec')
-rw-r--r--actionmailer/actionmailer.gemspec2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec
index 278076f699..fa6043fdd7 100644
--- a/actionmailer/actionmailer.gemspec
+++ b/actionmailer/actionmailer.gemspec
@@ -23,6 +23,6 @@ Gem::Specification.new do |s|
s.add_dependency 'actionview', version
s.add_dependency 'activejob', version
- s.add_dependency 'mail', '~> 2.6'
+ s.add_dependency 'mail', ['~> 2.5', '>= 2.5.4']
s.add_dependency 'rails-dom-testing', '~> 1.0', '>= 1.0.5'
end