BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit d0f6654e by Alexander Balashov
Options

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
parent e3746197
Showing with 3 additions and 3 deletions
config/environments/production.rb
...@@ -11,8 +11,9 @@ Gitlab::Application.configure do ...@@ -11,8 +11,9 @@ Gitlab::Application.configure do
# Disable Rails's static asset server (Apache or nginx will already do this) # Disable Rails's static asset server (Apache or nginx will already do this)
config.serve_static_assets = false config.serve_static_assets = false
# Compress JavaScripts and CSS # Compress JavaScripts and CSS.
config.assets.compress = true config.assets.js_compressor = :uglifier
# config.assets.css_compressor = :sass
# Don't fallback to assets pipeline if a precompiled asset is missed # Don't fallback to assets pipeline if a precompiled asset is missed
config.assets.compile = true config.assets.compile = true
...@@ -74,7 +75,6 @@ Gitlab::Application.configure do ...@@ -74,7 +75,6 @@ Gitlab::Application.configure do
config.action_mailer.raise_delivery_errors = true config.action_mailer.raise_delivery_errors = true
config.eager_load = true config.eager_load = true
config.assets.js_compressor = :uglifier
config.allow_concurrency = false config.allow_concurrency = false
end end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment