diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2018-12-19 21:09:34 +0100 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2018-12-19 21:47:50 +0100 |
| commit | 1b7c3222e86b98ce886110ae0860ba62e35e2299 (patch) | |
| tree | 21728e09c24e5d9c79360a820b49b1b72efb3a70 /actionmailer | |
| parent | abae9d0e0a0f1628cbf608765db09c1db3303732 (diff) | |
| download | rails-1b7c3222e86b98ce886110ae0860ba62e35e2299.tar.gz rails-1b7c3222e86b98ce886110ae0860ba62e35e2299.tar.bz2 rails-1b7c3222e86b98ce886110ae0860ba62e35e2299.zip | |
Require Ruby 2.5 for Rails 6.
Generally followed the pattern for https://github.com/rails/rails/pull/32034
* Removes needless CI configs for 2.4
* Targets 2.5 in rubocop
* Updates existing CHANGELOG entries for fewer merge conflicts
* Removes Hash#slice extension as that's inlined on Ruby 2.5.
* Removes the need for send on define_method in MethodCallAssertions.
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | actionmailer/actionmailer.gemspec | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md index 2de83e611b..5f3fc44e6e 100644 --- a/actionmailer/CHANGELOG.md +++ b/actionmailer/CHANGELOG.md @@ -57,9 +57,9 @@ *Claudio Ortolina*, *Kota Miyake* -* Rails 6 requires Ruby 2.4.1 or newer. +* Rails 6 requires Ruby 2.5.0 or newer. - *Jeremy Daer* + *Jeremy Daer*, *Kasper Timm Hansen* Please check [5-2-stable](https://github.com/rails/rails/blob/5-2-stable/actionmailer/CHANGELOG.md) for previous changes. diff --git a/actionmailer/actionmailer.gemspec b/actionmailer/actionmailer.gemspec index 6f8d6d0699..a6c482f1a0 100644 --- a/actionmailer/actionmailer.gemspec +++ b/actionmailer/actionmailer.gemspec @@ -9,7 +9,7 @@ Gem::Specification.new do |s| s.summary = "Email composition, delivery, and receiving framework (part of Rails)." s.description = "Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments." - s.required_ruby_version = ">= 2.4.1" + s.required_ruby_version = ">= 2.5.0" s.license = "MIT" |