aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/generators/app_generator_test.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2011-04-23 01:16:21 +0200
committerXavier Noria <fxn@hashref.com>2011-04-23 01:16:21 +0200
commit384dbfd1408721ded071a587b0dc9ee40203607e (patch)
tree770854b984691dea8187ca0a998a28e93a008093 /railties/test/generators/app_generator_test.rb
parent900470cf3cd346ad1b17cf6902f3f98e6dae7709 (diff)
parentaf1b48926f49226c934995c322ee017239158cf3 (diff)
downloadrails-384dbfd1408721ded071a587b0dc9ee40203607e.tar.gz
rails-384dbfd1408721ded071a587b0dc9ee40203607e.tar.bz2
rails-384dbfd1408721ded071a587b0dc9ee40203607e.zip
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/test/generators/app_generator_test.rb')
-rw-r--r--railties/test/generators/app_generator_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 3ef06c7f25..58febfd9c7 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -23,7 +23,7 @@ DEFAULT_APP_FILES = %w(
lib
lib/tasks
log
- public/images
+ app/assets/images
script/rails
test/fixtures
test/functional