From 101406d7430ce7d9350abdcbf2e7d04fa84779e7 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Wed, 13 Apr 2011 14:30:39 +0200 Subject: Move to app/assets in anticipation of image support being added as well. Also add vendor/assets to default load path --- railties/lib/rails/application.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'railties/lib/rails/application.rb') 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", -- cgit v1.2.3