From 83537bf09010a56510927939f3ea31d30f612a25 Mon Sep 17 00:00:00 2001 From: Pratik Naik Date: Thu, 30 Jul 2009 17:49:05 +0100 Subject: Generator config should be commented by default --- .../lib/generators/rails/app/templates/config/environment.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'railties/lib/generators/rails/app/templates') 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 -- cgit v1.2.3 From df745ed80556692f2363a661c8504601be40a5ad Mon Sep 17 00:00:00 2001 From: Michael Koziarski Date: Sun, 9 Aug 2009 11:11:34 +1200 Subject: Depend on rubygems 1.3.2 Also move the min_version definition up a line so it's present in the rescue block down below. --- railties/lib/generators/rails/app/templates/config/boot.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'railties/lib/generators/rails/app/templates') 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 -- cgit v1.2.3