From 646cca312847a73da6979496d588a5c374422530 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 16 Dec 2013 18:21:24 +1100 Subject: [PATCH] Good luck getting this updated everywhere, kicking myself really hard for allowing these stupid sample files see: http://meta.discourse.org/t/enough-with-the-sample-files/10351 Our default sample setup was not minifying css or js causing js and css to be 2.5x larger than it needed Anyone using my docker setup, please run a new bootstrap. Anyone else, apply diff manually. --- Gemfile_rails4.lock | 2 +- config/environments/production.rb.sample | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Gemfile_rails4.lock b/Gemfile_rails4.lock index 9364ac8f2..fa39ee6ec 100644 --- a/Gemfile_rails4.lock +++ b/Gemfile_rails4.lock @@ -388,7 +388,7 @@ GEM polyglot (>= 0.3.1) trollop (2.0) tzinfo (0.3.38) - uglifier (2.3.1) + uglifier (2.3.3) execjs (>= 0.3.0) json (>= 1.8.0) unf (0.1.3) diff --git a/config/environments/production.rb.sample b/config/environments/production.rb.sample index d486132aa..2855e6b46 100644 --- a/config/environments/production.rb.sample +++ b/config/environments/production.rb.sample @@ -16,6 +16,10 @@ Discourse::Application.configure do # Compress JavaScripts and CSS config.assets.compress = true + # rails 4 + config.assets.js_compressor = :uglifier + config.assets.css_compressor = :sass + # stuff should be pre-compiled config.assets.compile = false