aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-03-31 04:59:23 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2008-03-31 04:59:23 +0000
commitf6484e63c1678712cd3f9be874bdb011598d2454 (patch)
tree28097745c97f1d760fb99e828faae9ae9363610c /railties
parentdf0d56c1f6ceb9e8aa9662ec8e91b3f0e2b0946c (diff)
downloadrails-f6484e63c1678712cd3f9be874bdb011598d2454.tar.gz
rails-f6484e63c1678712cd3f9be874bdb011598d2454.tar.bz2
rails-f6484e63c1678712cd3f9be874bdb011598d2454.zip
rename config/initializers/new_in_rails_3.rb to new_rails_defaults.rb
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9163 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
-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"