diff options
| author | lihan <frankieteardrop@gmail.com> | 2012-10-03 16:34:41 -0400 |
|---|---|---|
| committer | lihan <frankieteardrop@gmail.com> | 2012-10-03 17:29:29 -0400 |
| commit | 36261c816592ab34c41dad82d1e6396d979e0672 (patch) | |
| tree | dc41a5f829f3d3f5cd7db18afd1225c1df75cab7 | |
| parent | 288885f9ebf07a12ce64bc3b4a73e9dbc27eeb40 (diff) | |
| download | rails-36261c816592ab34c41dad82d1e6396d979e0672.tar.gz rails-36261c816592ab34c41dad82d1e6396d979e0672.tar.bz2 rails-36261c816592ab34c41dad82d1e6396d979e0672.zip | |
Update supported ruby versions error message in ruby_version_check.rb
| -rw-r--r-- | railties/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | railties/lib/rails/ruby_version_check.rb | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index f41f91cf22..27f4fd6de7 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,7 @@ +## Rails 3.2.9 (unreleased) + +* Update supported ruby versions error message in ruby_version_check.rb *Lihan Li* + ## Rails 3.2.8 (Aug 9, 2012) ## * ERB scaffold generator use the `:data => { :confirm => "Text" }` syntax instead of `:confirm`. diff --git a/railties/lib/rails/ruby_version_check.rb b/railties/lib/rails/ruby_version_check.rb index 4d57c5973c..d6c7716c0d 100644 --- a/railties/lib/rails/ruby_version_check.rb +++ b/railties/lib/rails/ruby_version_check.rb @@ -2,7 +2,7 @@ if RUBY_VERSION < '1.8.7' 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 3 requires Ruby 1.8.7 or >= 1.9.2. You're running #{desc} @@ -14,7 +14,7 @@ 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. + releases have segfaulted the test suite. Please upgrade to Ruby 1.9.2 or later. You're running #{RUBY_DESCRIPTION} |