aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-10-15 02:56:35 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-10-15 02:56:35 +0000
commit08917a6c5e56430e3f2e5e89c5524b78d88a235b (patch)
treee00516ee68021faa8f12c61e913c10c9a1786f8b
parentf8f4eccd9afa1ed665980a3c5b1651f25956798a (diff)
downloadrails-08917a6c5e56430e3f2e5e89c5524b78d88a235b.tar.gz
rails-08917a6c5e56430e3f2e5e89c5524b78d88a235b.tar.bz2
rails-08917a6c5e56430e3f2e5e89c5524b78d88a235b.zip
Fixed script/performance
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2605 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
-rw-r--r--railties/Rakefile2
-rw-r--r--railties/lib/rails_generator/generators/applications/app/app_generator.rb2
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