Update HSTS to publish a max-age=0 to disable it

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

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index da975acc9e90c1804060f615775a5d9d4724ceac..b60edd633c25e9748d76655e14824df080ed7f10 100644 (file)
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -4,7 +4,7 @@
 Rails.application.config.assets.version = "1.0"
 
 # Location of manifest file.
 Rails.application.config.assets.version = "1.0"
 
 # Location of manifest file.

-Rails.application.config.assets.manifest = Rails.root.join("tmp/manifest.json")
+Rails.application.config.assets.manifest = Rails.root.join("tmp", "manifest.json")

 
 # Add additional assets to the asset load path
 Rails.application.config.assets.paths << Rails.root.join("config")
 
 # Add additional assets to the asset load path
 Rails.application.config.assets.paths << Rails.root.join("config")


@@ -12,7 +12,7 @@ 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)
 # 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 login.js diary_entry.js)
+Rails.application.config.assets.precompile += %w(user.js login.js diary_entry.js edit/*.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(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)