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

diff --git a/config/application.rb b/config/application.rb
index 9ba122dafb8b1518af4930f92ceec945befff7ec..b6e2ba46788c14d6342e934f31a0364b9e83c43c 100644 (file)
--- 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 (file)
index 0000000..00584e5
--- /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