diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-17 10:36:02 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-11-17 10:36:02 -0800 |
| commit | 435b088f5aa5d6bc38369dd9c9d067e21e5b7de1 (patch) | |
| tree | 3f64164d58791c4762c5fc5d4ca5240e0aecfebf /railties/lib/rails_generator | |
| parent | 6ff506ffbc438a92cb6d3cb4351a0a463d57424a (diff) | |
| parent | fcce1f17eaf9993b0210fe8e2a8117b61a1f0f69 (diff) | |
| download | rails-435b088f5aa5d6bc38369dd9c9d067e21e5b7de1.tar.gz rails-435b088f5aa5d6bc38369dd9c9d067e21e5b7de1.tar.bz2 rails-435b088f5aa5d6bc38369dd9c9d067e21e5b7de1.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'railties/lib/rails_generator')
| -rw-r--r-- | railties/lib/rails_generator/generators/applications/app/app_generator.rb | 3 |
1 files changed, 2 insertions, 1 deletions
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 32c320385d..8c9bc63fc6 100644 --- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb +++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb @@ -47,7 +47,8 @@ class AppGenerator < Rails::Generator::Base m.file "README", "README" # Application - m.template "helpers/application.rb", "app/controllers/application.rb", :assigns => { :app_name => @app_name, :app_secret => md5.hexdigest } + m.template "helpers/application_controller.rb", "app/controllers/application_controller.rb", :assigns => { + :app_name => @app_name, :app_secret => md5.hexdigest } m.template "helpers/application_helper.rb", "app/helpers/application_helper.rb" m.template "helpers/test_helper.rb", "test/test_helper.rb" m.template "helpers/performance_test.rb", "test/performance/browsing_test.rb" |