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

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

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 7bd35daf6acaa08322599b59b6589ac68461ae4c..4193fe482e777cb5ddb5f241cd48c700bf062f5b 100644 (file)
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -20,7 +20,7 @@ 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[errors.css]
-Rails.application.config.assets.precompile += %w[html5shiv.js]
+Rails.application.config.assets.precompile += %w[html5shiv.js es5.js es6.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]