diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-04-23 01:16:21 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-04-23 01:16:21 +0200 |
| commit | 384dbfd1408721ded071a587b0dc9ee40203607e (patch) | |
| tree | 770854b984691dea8187ca0a998a28e93a008093 /railties/lib/rails/application/configuration.rb | |
| parent | 900470cf3cd346ad1b17cf6902f3f98e6dae7709 (diff) | |
| parent | af1b48926f49226c934995c322ee017239158cf3 (diff) | |
| download | rails-384dbfd1408721ded071a587b0dc9ee40203607e.tar.gz rails-384dbfd1408721ded071a587b0dc9ee40203607e.tar.bz2 rails-384dbfd1408721ded071a587b0dc9ee40203607e.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/lib/rails/application/configuration.rb')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index bd8c314da6..f818313955 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -35,6 +35,9 @@ module Rails @assets.paths = [] @assets.precompile = [ /\w+\.(?!js|css)$/, "application.js", "application.css" ] @assets.prefix = "/assets" + + @assets.js_compressor = nil + @assets.css_compressor = nil end def compiled_asset_path |