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

[rails.git] / config / initializers / assets.rb

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index ef7efcbb95fd8b254192a080cf0c332e5b3971ed..da975acc9e90c1804060f615775a5d9d4724ceac 100644 (file)
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -1,29 +1,34 @@
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.
-Rails.application.config.assets.version = '1.0'
+Rails.application.config.assets.version = "1.0"
+
+# Location of manifest file.
+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.
-Rails.application.config.assets.precompile += %w( index.js browse.js welcome.js fixthemap.js )
-Rails.application.config.assets.precompile += %w( user.js diary_entry.js )
-Rails.application.config.assets.precompile += %w( routing.js )
-Rails.application.config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css )
-Rails.application.config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css )
-Rails.application.config.assets.precompile += %w( leaflet-all.css leaflet.ie.css )
-Rails.application.config.assets.precompile += %w( embed.js embed.css )
-Rails.application.config.assets.precompile += %w( html5shiv.js )
-Rails.application.config.assets.precompile += %w( images/marker-*.png img/*-handle.png )
-Rails.application.config.assets.precompile += %w( swfobject.js expressInstall.swf )
-Rails.application.config.assets.precompile += %w( potlatch2.swf )
-Rails.application.config.assets.precompile += %w( potlatch2/assets.zip )
-Rails.application.config.assets.precompile += %w( potlatch2/FontLibrary.swf )
-Rails.application.config.assets.precompile += %w( potlatch2/locales/*.swf )
-Rails.application.config.assets.precompile += %w( help/introduction.* )
-Rails.application.config.assets.precompile += %w( iD.js iD.css )
-Rails.application.config.assets.precompile += %w( iD/img/*.svg iD/img/*.png iD/img/*.gif )
-Rails.application.config.assets.precompile += %w( iD/img/pattern/*.png )
-Rails.application.config.assets.precompile += %w( iD/locales/*.json )
+Rails.application.config.assets.precompile += %w(index.js browse.js welcome.js fixthemap.js)
+Rails.application.config.assets.precompile += %w(user.js login.js diary_entry.js)
+Rails.application.config.assets.precompile += %w(screen-ltr.css print-ltr.css)
+Rails.application.config.assets.precompile += %w(screen-rtl.css print-rtl.css)
+Rails.application.config.assets.precompile += %w(leaflet-all.css leaflet.ie.css)
+Rails.application.config.assets.precompile += %w(id.js id.css)
+Rails.application.config.assets.precompile += %w(embed.js embed.css)
+Rails.application.config.assets.precompile += %w(html5shiv.js)
+Rails.application.config.assets.precompile += %w(images/marker-*.png img/*-handle.png)
+Rails.application.config.assets.precompile += %w(swfobject.js expressInstall.swf)
+Rails.application.config.assets.precompile += %w(potlatch2.swf)
+Rails.application.config.assets.precompile += %w(potlatch2/assets.zip)
+Rails.application.config.assets.precompile += %w(potlatch2/FontLibrary.swf)
+Rails.application.config.assets.precompile += %w(potlatch2/locales/*.swf)
+Rails.application.config.assets.precompile += %w(help/introduction.*)
+Rails.application.config.assets.precompile += %w(iD/img/*.svg iD/img/*.png iD/img/*.gif)
+Rails.application.config.assets.precompile += %w(iD/img/pattern/*.png)
+Rails.application.config.assets.precompile += %w(iD/locales/*.json)
+Rails.application.config.assets.precompile += %w(iD/traffico/stylesheets/traffico.css)
+Rails.application.config.assets.precompile += %w(iD/traffico/fonts/traffico_*)
+Rails.application.config.assets.precompile += %w(iD/traffico/string-maps/*.json)