Merge remote-tracking branch 'openstreetmap/pull/1495'

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index 142e436c5162d72d59445cf71d7eae095e1866bf..5ff166beb1ab86812c100eb18d6d376534e857da 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -56,5 +56,8 @@ 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