Merge pull request #15493 from bf4/relax_mail_dep

Relax mail gem constraint from ~> 2.5.4 to ~> 2.5
rails · Jun 3, 2014 · 3d2f340 · 3d2f340
1 parent 8ac5b94
commit 3d2f340
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec
@@ -22,5 +22,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'actionpack', version
   s.add_dependency 'actionview', version
 
-  s.add_dependency 'mail', '~> 2.5.4'
+  s.add_dependency 'mail', ['~> 2.5', '>= 2.5.4']
 end