summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-02 15:23:57 -0800
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-03-02 15:23:57 -0800
commiteb865c43d00b9c11beb6914c67878f04bb622b45 (patch)
treef70262dbad1e58d277ef89b9087c280245a05656
parent33e107127a4c37cefaf24c0f5dd335e782594da3 (diff)
parentd0f6654e9ced38d03f5946fde10c3f0e3732a5d7 (diff)
downloadgitlab-ce-eb865c43d00b9c11beb6914c67878f04bb622b45.tar.gz
Merge pull request #8349 from divineforest/cleanup-assets-compress
Remove useless `assets.compress` option, Rails 4 uses only `assets.js_co...
-rw-r--r--config/environments/production.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 78bf543402b..3316ece3873 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -11,8 +11,9 @@ Gitlab::Application.configure do
# Disable Rails's static asset server (Apache or nginx will already do this)
config.serve_static_assets = false
- # Compress JavaScripts and CSS
- config.assets.compress = true
+ # Compress JavaScripts and CSS.
+ config.assets.js_compressor = :uglifier
+ # config.assets.css_compressor = :sass
# Don't fallback to assets pipeline if a precompiled asset is missed
config.assets.compile = true
@@ -74,7 +75,6 @@ Gitlab::Application.configure do
config.action_mailer.raise_delivery_errors = true
config.eager_load = true
- config.assets.js_compressor = :uglifier
config.allow_concurrency = false
end