Remove generator environment until we have a gem manifest.

2 files changed, 19 insertions, 18 deletions

diff --git a/railties/lib/generators/rails/app/templates/config/environment.rb b/railties/lib/generators/rails/app/templates/config/environment.rb
index 84c5abf1e9..02fbb57b87 100644
--- a/railties/lib/generators/rails/app/templates/config/environment.rb
+++ b/railties/lib/generators/rails/app/templates/config/environment.rb
@@ -42,4 +42,23 @@ Rails::Initializer.run do |config|
   # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
   # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
   # config.i18n.default_locale = :de
+
+  # Configure generators default options.
+  config.generators do |g|
+    # Scaffold configuration
+    g.helper      = true
+    g.layout      = true
+    g.stylesheets = true
+
+    # ORM configuration
+    g.orm        = :active_record
+    g.timestamps = true
+
+    # Template engine configuration
+    g.template_engine = :erb
+
+    # Test framework configuration
+    g.test_framework = :test_unit
+    g.fixtures       = true
+  end
 end
diff --git a/railties/lib/generators/rails/app/templates/config/environments/generators.rb b/railties/lib/generators/rails/app/templates/config/environments/generators.rb
deleted file mode 100644
index 1b426f5a05..0000000000
--- a/railties/lib/generators/rails/app/templates/config/environments/generators.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# Settings specified here will take precedence over those in config/environment.rb
-
-# No need to reload in generators environment, so do cache classes.
-config.cache_classes = true
-
-# Log error messages when you accidentally call methods on nil.
-config.whiny_nils = true
-
-# Configure generators options (below are default values, delete them if you want).
-config.generators do |g|
-  g.helper          = true
-  g.layout          = true
-  g.orm             = :active_record
-  g.stylesheets     = true
-  g.template_engine = :erb
-  g.test_framework  = :test_unit
-  g.timestamps      = true
-end