summaryrefslogtreecommitdiff
path: root/config/environments
diff options
context:
space:
mode:
authorAlexander Balashov <divineforest@gmail.com>2014-11-18 10:12:05 +0300
committerAlexander Balashov <divineforest@gmail.com>2014-11-18 10:12:05 +0300
commitd0f6654e9ced38d03f5946fde10c3f0e3732a5d7 (patch)
tree5ef80cbf92d8768cce76489b923e2fd915168611 /config/environments
parente37461979a5eb890975125134e7717c470c76a5f (diff)
downloadgitlab-ce-d0f6654e9ced38d03f5946fde10c3f0e3732a5d7.tar.gz
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
Diffstat (limited to 'config/environments')
-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