aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/CHANGELOG2
-rwxr-xr-xrailties/bin/rails5
2 files changed, 6 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index d979b06ac5..1b7e6c0da9 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Added early failure if the Ruby version isn't 1.8.2 or above #735
+
* Fixed the missing shebang in main "rails" script #736
* Removed the obsolete -i/--index option from the WEBrick servlet #743
diff --git a/railties/bin/rails b/railties/bin/rails
index b3a25d6d59..4fba694d1f 100755
--- a/railties/bin/rails
+++ b/railties/bin/rails
@@ -1,5 +1,8 @@
#!/usr/local/bin/ruby
+
+puts "Rails requires Ruby 1.8.2" and exit if RUBY_VERSION < "1.8.2"
+
require File.dirname(__FILE__) + '/../lib/rails_generator'
require 'rails_generator/scripts/generate'
Rails::Generator::Base.use_application_sources!
-Rails::Generator::Scripts::Generate.new.run(ARGV, :generator => 'app')
+Rails::Generator::Scripts::Generate.new.run(ARGV, :generator => 'app') \ No newline at end of file