From: Tom Hughes <tom@compton.nu>
Date: Wed, 28 Mar 2018 16:23:21 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/pull/1795'
X-Git-Tag: live~3108
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/475e40d21594ac67116c106036cd7e463b1d3509?hp=9a5d83598727507c978ac18e47b5fcc1dc687fd3

Merge remote-tracking branch 'upstream/pull/1795'
---

diff --git a/config/application.rb b/config/application.rb
index 9ba122daf..b6e2ba467 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -43,8 +43,5 @@ module OpenStreetMap
       config.logstasher.logger_path = LOGSTASH_PATH
       config.logstasher.log_controller_parameters = true
     end
-
-    # Configure image optimisation
-    config.assets.image_optim = YAML.load_file(Rails.root.join("config", "image_optim.yml"))
   end
 end
diff --git a/config/image_optim/test.yml b/config/image_optim/test.yml
new file mode 100644
index 000000000..00584e523
--- /dev/null
+++ b/config/image_optim/test.yml
@@ -0,0 +1,11 @@
+skip_missing_workers: true
+advpng: false
+gifsicle: false
+jhead: false
+jpegoptim: false
+jpegtran: false
+optipng: false
+pngquant: false
+pngout: false
+pngcrush: false
+svgo: false