diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-09 21:56:28 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-09-09 21:56:28 -0700 |
| commit | be24be62b60c9cf6ca79aa7d20cabe6f3691e0c3 (patch) | |
| tree | 1494570dd262026b7a521e5f24b0a8d0d561954a /railties/lib | |
| parent | f43ffdcb9677d4fbe03ccd83a4c427b57ccd15f0 (diff) | |
| parent | 901c02d86a1e2cccc8cc2c6ea9ec3f68a6c72607 (diff) | |
| download | rails-be24be62b60c9cf6ca79aa7d20cabe6f3691e0c3.tar.gz rails-be24be62b60c9cf6ca79aa7d20cabe6f3691e0c3.tar.bz2 rails-be24be62b60c9cf6ca79aa7d20cabe6f3691e0c3.zip | |
Merge pull request #2876 from alex3/patch-1
Fixed assets precompile regex
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 0ca664e4f0..a48db3b6d2 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -37,7 +37,8 @@ module Rails @assets = ActiveSupport::OrderedOptions.new @assets.enabled = false @assets.paths = [] - @assets.precompile = [ /\w+\.(?!js|css).+/, /application.(css|js)$/ ] + @assets.precompile = [ Proc.new{ |path| !File.extname(path).in?(['.js', '.css']) }, + /application.(css|js)$/ ] @assets.prefix = "/assets" @assets.version = '' @assets.debug = false |