diff options
| author | Joshua Peek <josh@joshpeek.com> | 2011-03-22 16:15:05 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2011-03-22 16:15:05 -0500 |
| commit | 989103a2334648c5b63e51a9480bcc435283f559 (patch) | |
| tree | 06bcd69c8ac2e98a46299336aa09d8cfc5c70154 | |
| parent | 628c31b353706877322e7613702d1bd4a59e3514 (diff) | |
| download | rails-989103a2334648c5b63e51a9480bcc435283f559.tar.gz rails-989103a2334648c5b63e51a9480bcc435283f559.tar.bz2 rails-989103a2334648c5b63e51a9480bcc435283f559.zip | |
Move app/javascripts and app/stylesheets under app/assets
| -rw-r--r-- | railties/lib/rails/application.rb | 12 |
1 files changed, 6 insertions, 6 deletions
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 |