diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-03-05 10:58:16 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-03-05 10:58:16 -0700 |
| commit | f18b5fe9b1a57d0ec0a3631000fce168b33e1e54 (patch) | |
| tree | ee81810ed12a88bc7af7e3c501d822f37d8e43b2 /railties | |
| parent | d2a9bd1ae4a3c53c44a58f810877ba44f714033f (diff) | |
| parent | 8ed0b89bbdfa73740e00ddb2a001e0df947b6ef9 (diff) | |
| download | rails-f18b5fe9b1a57d0ec0a3631000fce168b33e1e54.tar.gz rails-f18b5fe9b1a57d0ec0a3631000fce168b33e1e54.tar.bz2 rails-f18b5fe9b1a57d0ec0a3631000fce168b33e1e54.zip | |
Merge pull request #19215 from gsamokovarov/revert-ruby-2-2-0-kwarg-crash-workarounds
Revert work arounds for upstream Ruby 2.2.0 kwargs bug
Diffstat (limited to 'railties')
| -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 e2a199ec4d..9131c51e91 100644 --- a/railties/lib/rails/ruby_version_check.rb +++ b/railties/lib/rails/ruby_version_check.rb @@ -1,13 +1,13 @@ -if RUBY_VERSION < '2.2.0' && RUBY_ENGINE == 'ruby' +if RUBY_VERSION < '2.2.1' && RUBY_ENGINE == 'ruby' desc = defined?(RUBY_DESCRIPTION) ? RUBY_DESCRIPTION : "ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE})" abort <<-end_message - Rails 5 requires to run on Ruby 2.2.0 or newer. + Rails 5 requires to run on Ruby 2.2.1 or newer. You're running #{desc} - Please upgrade to Ruby 2.2.0 or newer to continue. + Please upgrade to Ruby 2.2.1 or newer to continue. end_message end |