Merge remote-tracking branch 'parent/main' into upstream-20240628

2024-06-28 08:57:12 +09:00 · 2024-06-28 08:57:12 +09:00 · 6955843321
commit 6955843321
parent f7d978b7e3 ea6c455e81
178 changed files with 1924 additions and 1178 deletions
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@ -11,8 +11,6 @@
    - if storage_host?
      %link{ rel: 'dns-prefetch', href: storage_host }/

-    %link{ rel: 'icon', href: favicon_path('ico') || '/favicon.ico', type: 'image/x-icon' }/
-
    - SiteUpload::FAVICON_SIZES.each do |size|
      %link{ rel: 'icon', sizes: "#{size}x#{size}", href: favicon_path(size.to_i) || frontend_asset_path("icons/favicon-#{size}x#{size}.png"), type: 'image/png' }/