diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2011-04-13 14:30:39 +0200 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2011-04-13 14:31:09 +0200 |
| commit | 101406d7430ce7d9350abdcbf2e7d04fa84779e7 (patch) | |
| tree | 45a8d64b8194a1e0055b0cf8d7d8f5f1e09a965e /railties | |
| parent | ab1f91394f630a0a5a9c3de6ed0cb797d3bf56e2 (diff) | |
| download | rails-101406d7430ce7d9350abdcbf2e7d04fa84779e7.tar.gz rails-101406d7430ce7d9350abdcbf2e7d04fa84779e7.tar.bz2 rails-101406d7430ce7d9350abdcbf2e7d04fa84779e7.zip | |
Move to app/assets in anticipation of image support being added as well. Also add vendor/assets to default load path
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/application.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index 92f03f06bf..e3942f0f1f 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -153,8 +153,10 @@ module Rails initializer :add_sprockets_paths do |app| if config.assets.enabled paths = [ - "app/javascripts", - "app/stylesheets", + "app/assets/javascripts", + "app/assets/stylesheets", + "vendor/assets/javascripts", + "vendor/assets/stylesheets", "vendor/plugins/*/app/javascripts", "vendor/plugins/*/app/stylesheets", "vendor/plugins/*/javascripts", |