diff options
| author | Tobias Schlottke <tobias.schlottke@gmail.com> | 2011-07-01 09:53:48 +0200 |
|---|---|---|
| committer | Tobias Schlottke <tobias.schlottke@gmail.com> | 2011-07-01 09:53:48 +0200 |
| commit | 139971d3cc06168a69617a61058240afe227af99 (patch) | |
| tree | b8dc04aeaa101208744640858f22d66079eb6eee /railties/lib/rails/application | |
| parent | cb99c8593a8d5a92378a8167486d5148c1e2dff5 (diff) | |
| download | rails-139971d3cc06168a69617a61058240afe227af99.tar.gz rails-139971d3cc06168a69617a61058240afe227af99.tar.bz2 rails-139971d3cc06168a69617a61058240afe227af99.zip | |
Now accepting css/js files in deeper directory structures by default.
This is useful for engines with own application.{js|css}-files.
See: https://github.com/rails/rails/issues/1520
Diffstat (limited to 'railties/lib/rails/application')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 3b74de690a..1a29483a73 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -34,7 +34,7 @@ module Rails @assets = ActiveSupport::OrderedOptions.new @assets.enabled = false @assets.paths = [] - @assets.precompile = [ /\w+\.(?!js|css).+/, "application.js", "application.css" ] + @assets.precompile = [ /\w+\.(?!js|css).+/, /application.(css|js)$/ ] @assets.prefix = "/assets" @assets.js_compressor = nil |