diff options
author | José Valim <jose.valim@gmail.com> | 2011-12-20 16:53:44 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-12-20 16:55:01 +0100 |
commit | 4fa615a8661eb13d4bd8a7de4d839e9883ef26ec (patch) | |
tree | fca4c9448f55d1a30ec17573c4a82bb983365fe5 | |
parent | 632fa15fa4ceec6dbb00bf26da249d3039749f50 (diff) | |
download | rails-4fa615a8661eb13d4bd8a7de4d839e9883ef26ec.tar.gz rails-4fa615a8661eb13d4bd8a7de4d839e9883ef26ec.tar.bz2 rails-4fa615a8661eb13d4bd8a7de4d839e9883ef26ec.zip |
Update ruby_version_check.
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | railties/lib/rails/ruby_version_check.rb | 14 |
2 files changed, 2 insertions, 14 deletions
diff --git a/.travis.yml b/.travis.yml index 88999fe831..68d5c594ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,5 @@ script: 'ci/travis.rb' rvm: - - 1.8.7 - - 1.9.2 - 1.9.3 env: - "GEM=railties" diff --git a/railties/lib/rails/ruby_version_check.rb b/railties/lib/rails/ruby_version_check.rb index 4d57c5973c..4536fedaa3 100644 --- a/railties/lib/rails/ruby_version_check.rb +++ b/railties/lib/rails/ruby_version_check.rb @@ -1,8 +1,8 @@ -if RUBY_VERSION < '1.8.7' +if RUBY_VERSION < '1.9.3' desc = defined?(RUBY_DESCRIPTION) ? RUBY_DESCRIPTION : "ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE})" abort <<-end_message - Rails 3 requires Ruby 1.8.7 or 1.9.2. + Rails 4 requires Ruby 1.9.3+. You're running #{desc} @@ -10,14 +10,4 @@ if RUBY_VERSION < '1.8.7' Please upgrade to continue. end_message -elsif RUBY_VERSION > '1.9' and RUBY_VERSION < '1.9.2' - $stderr.puts <<-end_message - - Rails 3 doesn't officially support Ruby 1.9.1 since recent stable - releases have segfaulted the test suite. Please upgrade to Ruby 1.9.2. - - You're running - #{RUBY_DESCRIPTION} - - end_message end |