From 989103a2334648c5b63e51a9480bcc435283f559 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Tue, 22 Mar 2011 16:15:05 -0500 Subject: Move app/javascripts and app/stylesheets under app/assets --- railties/lib/rails/application.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'railties/lib/rails/application.rb') diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index d2777ed5f1..ff9272c837 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -140,14 +140,14 @@ module Rails def self.default_sprockets_paths [ "app/assets", - "app/javascripts", - "app/stylesheets", + "app/assets/javascripts", + "app/assets/stylesheets", "vendor/plugins/*/app/assets", - "vendor/plugins/*/app/javascripts", - "vendor/plugins/*/app/stylesheets", + "vendor/plugins/*/app/assets/javascripts", + "vendor/plugins/*/app/assets/stylesheets", "vendor/plugins/*/assets", - "vendor/plugins/*/javascripts", - "vendor/plugins/*/stylesheets" + "vendor/plugins/*/assets/javascripts", + "vendor/plugins/*/assets/stylesheets" ] end -- cgit v1.2.3