aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/configs/initializers/new_rails_defaults.rb (renamed from railties/configs/initializers/new_in_rails_3.rb)0
-rw-r--r--railties/lib/rails_generator/generators/applications/app/app_generator.rb2
2 files changed, 1 insertions, 1 deletions
diff --git a/railties/configs/initializers/new_in_rails_3.rb b/railties/configs/initializers/new_rails_defaults.rb
index 0cc1993ed9..0cc1993ed9 100644
--- a/railties/configs/initializers/new_in_rails_3.rb
+++ b/railties/configs/initializers/new_rails_defaults.rb
diff --git a/railties/lib/rails_generator/generators/applications/app/app_generator.rb b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
index 359726ff01..85c417f7cd 100644
--- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb
+++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb
@@ -62,7 +62,7 @@ class AppGenerator < Rails::Generator::Base
# Initializers
m.template "configs/initializers/inflections.rb", "config/initializers/inflections.rb"
m.template "configs/initializers/mime_types.rb", "config/initializers/mime_types.rb"
- m.template "configs/initializers/new_in_rails_3.rb", "config/initializers/new_in_rails_3.rb"
+ m.template "configs/initializers/new_rails_defaults.rb", "config/initializers/new_rails_defaults.rb"
# Environments
m.file "environments/boot.rb", "config/boot.rb"