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

[rails.git] / app / views / layouts / _head.html.erb

diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
index c06b01ed1989574ea8acece3c5e96e6f5e6a2707..8c6b246d80b145f8fd3cd31102fa3219cc3fb346 100644 (file)
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -2,6 +2,8 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
   <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"/>
   <%= javascript_include_tag "html5shiv" unless browser.html5? %>
   <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
   <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"/>
   <%= javascript_include_tag "html5shiv" unless browser.html5? %>

+  <%= javascript_include_tag "es5" unless browser.es5? %>
+  <%= javascript_include_tag "es6" unless browser.es6? %>

   <%= javascript_include_tag "application" %>
   <%= javascript_include_tag "i18n/" + I18n.locale.to_s %>
   <%= stylesheet_link_tag "screen-#{dir}", :media => "screen" %>
   <%= javascript_include_tag "application" %>
   <%= javascript_include_tag "i18n/" + I18n.locale.to_s %>
   <%= stylesheet_link_tag "screen-#{dir}", :media => "screen" %>