diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2011-06-27 02:16:24 -0700 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2011-06-27 02:16:24 -0700 |
| commit | 449cc3e999d929a7769846ae1bc1394dbe613aba (patch) | |
| tree | 596cf6683b30a6d19c7c30e18232a8977d17a1a1 | |
| parent | 095f0466c880e802c287e899e4ed645e44453484 (diff) | |
| parent | 13f8b28cdf412b4207491657b0463e45a7611e73 (diff) | |
| download | rails-449cc3e999d929a7769846ae1bc1394dbe613aba.tar.gz rails-449cc3e999d929a7769846ae1bc1394dbe613aba.tar.bz2 rails-449cc3e999d929a7769846ae1bc1394dbe613aba.zip | |
Merge pull request #1481 from arunagw/lib_assets
Generating /lib/assets for assets
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 1 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 242677cc65..6af9d299aa 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -88,6 +88,7 @@ module Rails def lib empty_directory "lib" empty_directory_with_gitkeep "lib/tasks" + empty_directory_with_gitkeep "lib/assets" end def log diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 03d185165f..86217f4ab9 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -10,6 +10,7 @@ DEFAULT_APP_FILES = %w( config.ru app/assets/javascripts app/assets/stylesheets + app/assets/images app/controllers app/helpers app/mailers @@ -22,8 +23,8 @@ DEFAULT_APP_FILES = %w( doc lib lib/tasks + lib/assets log - app/assets/images script/rails test/fixtures test/functional |