diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-07-06 11:42:29 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-07-06 11:42:29 -0700 |
| commit | 61913684a2be30190b49d4f8ac3314b3f2556273 (patch) | |
| tree | 9ac63f3a31c6688f2e6a2226a93a5174d1e8d4d6 /railties/lib/rails | |
| parent | 2c72830cd97d3746dc02db71441e888678f10a86 (diff) | |
| parent | 139971d3cc06168a69617a61058240afe227af99 (diff) | |
| download | rails-61913684a2be30190b49d4f8ac3314b3f2556273.tar.gz rails-61913684a2be30190b49d4f8ac3314b3f2556273.tar.bz2 rails-61913684a2be30190b49d4f8ac3314b3f2556273.zip | |
Merge pull request #1926 from tobsch/master
Accept application.js/.css to exist in a deeper directory depth by default
Diffstat (limited to 'railties/lib/rails')
| -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 |