From: Tom Hughes <tom@compton.nu>
Date: Wed, 30 Sep 2015 18:34:14 +0000 (+0100)
Subject: Ensure assets are recompiled when configuration changes
X-Git-Tag: live~3971
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d1d784bccad962ef23ce55f166aff7f34deba72b

Ensure assets are recompiled when configuration changes
---

diff --git a/app/assets/javascripts/osm.js.erb b/app/assets/javascripts/osm.js.erb
index 61c2d1e6b..0f044c24f 100644
--- a/app/assets/javascripts/osm.js.erb
+++ b/app/assets/javascripts/osm.js.erb
@@ -1,3 +1,5 @@
+//= depend_on application.yml
+
 OSM = {
 <% if defined?(PIWIK) %>
   PIWIK:                 <%= PIWIK.to_json %>,
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index bb647b6a7..7baac7f78 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -7,7 +7,7 @@ Rails.application.config.assets.version = "1.0"
 Rails.application.config.assets.manifest = Rails.root.join("tmp/manifest.json")
 
 # Add additional assets to the asset load path
-# Rails.application.config.assets.paths << Emoji.images_path
+Rails.application.config.assets.paths << Rails.root.join("config")
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.