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

[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 8cab522236d4b20cc921f796cb40aff33a92847b..e6d709b27f7de74192a36af8760c9c96dc88febe 100644 (file)
--- a/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@ -1,11 +1,10 @@
 <%= tag.head :data => application_data do %>
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta name="viewport" content="width=device-width, initial-scale=1">
-  <%= javascript_include_tag "es6" unless browser.es6? %>
   <%= javascript_include_tag "turbo", :type => "module" %>
   <%= javascript_include_tag "application" %>
   <%= javascript_include_tag "i18n/#{I18n.locale}" %>
-  <% if preferred_site_color_scheme == "auto" %>
+  <% if preferred_color_scheme(:site) == "auto" %>
     <%= stylesheet_link_tag "screen-auto-#{dir}", :media => "screen" %>
   <% else %>
     <%= stylesheet_link_tag "screen-manual-#{dir}", :media => "screen" %>