aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG.md
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2018-12-19 21:09:34 +0100
committerKasper Timm Hansen <kaspth@gmail.com>2018-12-19 21:47:50 +0100
commit1b7c3222e86b98ce886110ae0860ba62e35e2299 (patch)
tree21728e09c24e5d9c79360a820b49b1b72efb3a70 /actionpack/CHANGELOG.md
parentabae9d0e0a0f1628cbf608765db09c1db3303732 (diff)
downloadrails-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 'actionpack/CHANGELOG.md')
-rw-r--r--actionpack/CHANGELOG.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 13fbbafc0c..95da4265a4 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -193,9 +193,9 @@
*Derek Prior*
-* 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/actionpack/CHANGELOG.md) for previous changes.