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 /railties/lib/rails | |
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 'railties/lib/rails')
-rw-r--r-- | railties/lib/rails/ruby_version_check.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/railties/lib/rails/ruby_version_check.rb b/railties/lib/rails/ruby_version_check.rb index b2d44d9b8e..ab5339bf24 100644 --- a/railties/lib/rails/ruby_version_check.rb +++ b/railties/lib/rails/ruby_version_check.rb @@ -1,15 +1,15 @@ # frozen_string_literal: true -if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.4.1") && RUBY_ENGINE == "ruby" +if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.5.0") && RUBY_ENGINE == "ruby" desc = defined?(RUBY_DESCRIPTION) ? RUBY_DESCRIPTION : "ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE})" abort <<-end_message - Rails 6 requires Ruby 2.4.1 or newer. + Rails 6 requires Ruby 2.5.0 or newer. You're running #{desc} - Please upgrade to Ruby 2.4.1 or newer to continue. + Please upgrade to Ruby 2.5.0 or newer to continue. end_message end |