From d0f6654e9ced38d03f5946fde10c3f0e3732a5d7 Mon Sep 17 00:00:00 2001
From: Alexander Balashov <divineforest@gmail.com>
Date: Tue, 18 Nov 2014 10:12:05 +0300
Subject: [PATCH] Remove useless `assets.compress` option, Rails 4 uses only
 `assets.js_compressor`

> The config.assets.compress option should be changed to config.assets.js_compressor like so for instance
---
 config/environments/production.rb | 6 +++---
 1 file 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
-- 
GitLab