Merge commit 'mainstream/master'

2 files changed, 6 insertions, 6 deletions

diff --git a/railties/lib/generators/rails/app/templates/config/boot.rb b/railties/lib/generators/rails/app/templates/config/boot.rb
index 0ad0f787f8..dd5e3b6916 100644
--- a/railties/lib/generators/rails/app/templates/config/boot.rb
+++ b/railties/lib/generators/rails/app/templates/config/boot.rb
@@ -82,8 +82,8 @@ module Rails
       end
 
       def load_rubygems
+        min_version = '1.3.2'
         require 'rubygems'
-        min_version = '1.3.1'
         unless rubygems_version >= min_version
           $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
           exit 1
diff --git a/railties/lib/generators/rails/app/templates/config/environment.rb b/railties/lib/generators/rails/app/templates/config/environment.rb
index 94c90475c6..adb3a3060a 100644
--- a/railties/lib/generators/rails/app/templates/config/environment.rb
+++ b/railties/lib/generators/rails/app/templates/config/environment.rb
@@ -45,9 +45,9 @@ Rails::Initializer.run do |config|
 
   # Configure generators values. Many other options are available, be sure to
   # check the documentation.
-  config.generators do |g|
-    g.orm             :active_record
-    g.template_engine :erb
-    g.test_framework  :test_unit, :fixture => true
-  end
+  # config.generators do |g|
+  #   g.orm             :active_record
+  #   g.template_engine :erb
+  #   g.test_framework  :test_unit, :fixture => true
+  # end
 end