diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2011-06-09 01:28:56 +0200 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2011-06-09 01:30:58 +0200 |
| commit | 93f30f053627aa3457abe32bc75ffeafa215ef55 (patch) | |
| tree | f91826ab942d66f1f46fd7a52f9b70519a3bb005 /actionpack/lib | |
| parent | 7d537b2106ab21a28e901e6e98c74df1f761243a (diff) | |
| download | rails-93f30f053627aa3457abe32bc75ffeafa215ef55.tar.gz rails-93f30f053627aa3457abe32bc75ffeafa215ef55.tar.bz2 rails-93f30f053627aa3457abe32bc75ffeafa215ef55.zip | |
If you set a js_compressor, it means that you want shit compressed -- we dont need a second option to turn that on
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/sprockets/railtie.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/sprockets/railtie.rb b/actionpack/lib/sprockets/railtie.rb index 7b8a7ad3bb..61fcb8798b 100644 --- a/actionpack/lib/sprockets/railtie.rb +++ b/actionpack/lib/sprockets/railtie.rb @@ -54,8 +54,8 @@ module Sprockets env.static_root = File.join(app.root.join("public"), assets.prefix) env.paths.concat assets.paths env.logger = Rails.logger - env.js_compressor = expand_js_compressor(assets.js_compressor) if assets.compress - env.css_compressor = expand_css_compressor(assets.css_compressor) if assets.compress + env.js_compressor = expand_js_compressor(assets.js_compressor) + env.css_compressor = expand_css_compressor(assets.css_compressor) env end |