mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove workaround for `mail` gem dependencies 

d9d8dcc6ba
https://github.com/rails/rails/pull/44083

Remove backwards compat workaround for versions earlier than 2.8.0
This commit is contained in:
Earlopain 2024-01-09 13:25:36 +01:00
parent 84f773f9d1
commit 45f64f5a0a
No known key found for this signature in database
GPG Key ID: 298A57787DC6EF08
4 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Gemfile.lock
View File

@ -32,19 +32,13 @@ PATH
activerecord (= 7.2.0.alpha)
activestorage (= 7.2.0.alpha)
activesupport (= 7.2.0.alpha)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
mail (>= 2.8.0)
actionmailer (7.2.0.alpha)
actionpack (= 7.2.0.alpha)
actionview (= 7.2.0.alpha)
activejob (= 7.2.0.alpha)
activesupport (= 7.2.0.alpha)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
mail (~> 2.5, >= 2.8.0)
rails-dom-testing (~> 2.2)
actionpack (7.2.0.alpha)
actionview (= 7.2.0.alpha)

5
actionmailbox/actionmailbox.gemspec
View File

@ -38,8 +38,5 @@ Gem::Specification.new do |s|
s.add_dependency "activejob", version
s.add_dependency "actionpack", version
s.add_dependency "mail", ">= 2.7.1"
s.add_dependency "net-imap"
s.add_dependency "net-pop"
s.add_dependency "net-smtp"
s.add_dependency "mail", ">= 2.8.0"
end

5
actionmailer/actionmailer.gemspec
View File

@ -38,9 +38,6 @@ Gem::Specification.new do |s|
s.add_dependency "actionview", version
s.add_dependency "activejob", version
s.add_dependency "mail", ["~> 2.5", ">= 2.5.4"]
s.add_dependency "net-imap"
s.add_dependency "net-pop"
s.add_dependency "net-smtp"
s.add_dependency "mail", ["~> 2.5", ">= 2.8.0"]
s.add_dependency "rails-dom-testing", "~> 2.2"
end

3
actionmailer/lib/action_mailer/delivery_methods.rb
View File

@ -32,8 +32,7 @@ module ActionMailer
add_delivery_method :sendmail, Mail::Sendmail,
location: "/usr/sbin/sendmail",
# See breaking change in the mail gem - https://github.com/mikel/mail/commit/7e1196bd29815a0901d7290c82a332c0959b163a
arguments: Gem::Version.new(Mail::VERSION.version) >= Gem::Version.new("2.8.0") ? %w[-i] : "-i"
arguments: %w[-i]
add_delivery_method :test, Mail::TestMailer
end