aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
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 /activerecord
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 'activerecord')
-rw-r--r--activerecord/CHANGELOG.md4
-rw-r--r--activerecord/activerecord.gemspec2
2 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 6f2b49c428..a7aff164c5 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -466,9 +466,9 @@
*Tan Huynh*, *Yukio Mizuta*
-* 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*
* Deprecate `update_attributes`/`!` in favor of `update`/`!`.
diff --git a/activerecord/activerecord.gemspec b/activerecord/activerecord.gemspec
index bcdd82052c..1e198c3a55 100644
--- a/activerecord/activerecord.gemspec
+++ b/activerecord/activerecord.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
s.summary = "Object-relational mapper framework (part of Rails)."
s.description = "Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in."
- s.required_ruby_version = ">= 2.4.1"
+ s.required_ruby_version = ">= 2.5.0"
s.license = "MIT"