Permalink
Browse files

Move to app/assets in anticipation of image support being added as we…

…ll. Also add vendor/assets to default load path
  • Loading branch information...
1 parent ab1f913 commit 101406d7430ce7d9350abdcbf2e7d04fa84779e7 @dhh dhh committed Apr 13, 2011
Showing with 4 additions and 2 deletions.
  1. +4 −2 railties/lib/rails/application.rb
@@ -153,8 +153,10 @@ def build_asset_environment
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",

1 comment on commit 101406d

@josh
Member
josh commented on 101406d Apr 13, 2011

Rolling back to app/javascripts, app/stylesheets for now. Some other things are involved in changing that, we can revisit this in a bit.

Please sign in to comment.