aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/CHANGELOG2
-rwxr-xr-xrailties/bin/rails11
2 files changed, 12 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index baa326703d..149c85e11d 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Extend Ruby version check to include RUBY_RELEASE_DATE >= '2005-12-25', the final Ruby 1.8.2 release. #1674 [court3nay@gmail.com]
+
* Improved documentation for environment config files. #1625 [court3nay@gmail.com]
*0.13.0*
diff --git a/railties/bin/rails b/railties/bin/rails
index 3fb61137a1..f094e4aac7 100755
--- a/railties/bin/rails
+++ b/railties/bin/rails
@@ -1,4 +1,13 @@
-abort "Rails requires Ruby 1.8.2" if RUBY_VERSION < "1.8.2"
+min_release = "1.8.2 (2004-12-25)"
+ruby_release = "#{RUBY_VERSION} (#{RUBY_RELEASE_DATE})"
+if ruby_release < min_release
+ abort <<-end_message
+
+ Rails requires Ruby version #{min_release} or later.
+ You're running #{ruby_release}; please upgrade to continue.
+
+ end_message
+end
Signal.trap("INT") { puts; exit }