From 703689fbcd6ab3141519554e4ec0d8471c8b765d Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Fri, 17 Jul 2015 17:09:25 -0700
Subject: [PATCH 1/3] Revert "revert back to using slow but lossless PNG
 optimization"

This reverts commit 92660a74bf2153804f2a8eac32658826f6ac844e.
---
 .image_optim.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.image_optim.yml b/.image_optim.yml
index e0416a670d..c7196cbb29 100644
--- a/.image_optim.yml
+++ b/.image_optim.yml
@@ -1,10 +1,11 @@
 skip_missing_workers: true
-allow_lossy: false
+allow_lossy: true
 # PNG
 advpng: false
 optipng: false
 pngcrush: false
-pngout: true
-pngquant: false
+pngout: false
+pngquant:
+  quality: !ruby/range 10..90
 # JPG
 jpegrecompress: false

From 1c107d513dc08ee828abf7931b6ab16de821d6a1 Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@codinghorror.com>
Date: Fri, 17 Jul 2015 17:24:39 -0700
Subject: [PATCH 2/3] try much less aggressive pngquant setting

---
 .image_optim.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.image_optim.yml b/.image_optim.yml
index c7196cbb29..ba5d735b27 100644
--- a/.image_optim.yml
+++ b/.image_optim.yml
@@ -6,6 +6,6 @@ optipng: false
 pngcrush: false
 pngout: false
 pngquant:
-  quality: !ruby/range 10..90
+  quality: !ruby/range 75..90
 # JPG
 jpegrecompress: false

From a23a04a1e5a879f3897a95f053b036290e21070a Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Fri, 17 Jul 2015 21:31:16 -0400
Subject: [PATCH 3/3] Version bump to v1.4.0.beta6

---
 lib/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/version.rb b/lib/version.rb
index b16d4c6d61..5fc644b4b6 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -5,7 +5,7 @@ module Discourse
       MAJOR = 1
       MINOR = 4
       TINY  = 0
-      PRE   = 'beta5'
+      PRE   = 'beta6'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
     end