diff options
| -rw-r--r-- | railties/Rakefile | 2 | ||||
| -rw-r--r-- | railties/lib/rails_generator/generators/applications/app/app_generator.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/Rakefile b/railties/Rakefile index 0a879580da..38b7ff27c2 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -28,7 +28,7 @@ RUBY_FORGE_USER = "webster132" # end -BASE_DIRS = %w( app config/environments components db doc log lib lib/tasks public script script/perform script/process test vendor vendor/plugins ) +BASE_DIRS = %w( app config/environments components db doc log lib lib/tasks public script script/performance script/process test vendor vendor/plugins ) APP_DIRS = %w( apis models controllers helpers views views/layouts ) PUBLIC_DIRS = %w( images javascripts stylesheets ) TEST_DIRS = %w( fixtures unit functional mocks mocks/development mocks/test ) 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 0e3549cd62..a5b5c14797 100644 --- a/railties/lib/rails_generator/generators/applications/app/app_generator.rb +++ b/railties/lib/rails_generator/generators/applications/app/app_generator.rb @@ -114,7 +114,7 @@ class AppGenerator < Rails::Generator::Base public/images public/javascripts public/stylesheets - script/perform + script/performance script/process test/fixtures test/functional |