Merge branch 'pull/5556'

AntonKhorev · Jan 28, 2025 · 475a3fd · 475a3fd
2 parents 8cab3c4 + 22b0022
commit 475a3fd
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 6,811 deletions.
diff --git a/Gemfile b/Gemfile
@@ -130,9 +130,6 @@ gem "ffi-libarchive"
 gem "gd2-ffij", ">= 0.4.0"
 gem "marcel"
 
-# Used for browser detection
-gem "browser", "< 6" # for ruby 3.1 support
-
 # Used for S3 object storage
 gem "aws-sdk-s3"
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -134,7 +134,6 @@ GEM
     brakeman (7.0.0)
       racc
     brotli (0.6.0)
-    browser (5.3.1)
     builder (3.3.0)
     bzip2-ffi (1.1.1)
       ffi (~> 1.0)
@@ -683,7 +682,6 @@ DEPENDENCIES
   bootstrap (~> 5.3.2)
   bootstrap_form (~> 5.0)
   brakeman
-  browser (< 6)
   bzip2-ffi
   cancancan
   canonical-rails

diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js
@@ -17,8 +17,6 @@
 
 //= link_tree ../../../vendor/assets/leaflet .png
 
-//= link_directory ../../../vendor/assets/polyfill .js
-
 //= link leaflet/dist/images/marker-icon.png
 //= link leaflet/dist/images/marker-icon-2x.png
 //= link leaflet/dist/images/marker-shadow.png
diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb
@@ -1,7 +1,6 @@
 <%= 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}" %>

diff --git a/app/views/layouts/_meta.html.erb b/app/views/layouts/_meta.html.erb
@@ -1,4 +1,3 @@
-<%= favicon_link_tag "favicon.ico" if browser.ie? %>
 <% [57, 60, 72, 76, 114, 120, 144, 152, 180].each do |size| -%>
 <%= favicon_link_tag "apple-touch-icon-#{size}x#{size}.png", :rel => "apple-touch-icon", :sizes => "#{size}x#{size}", :type => "image/png" %>
 <% end -%>

diff --git a/config/initializers/browser.rb b/config/initializers/browser.rb
diff --git a/vendor/assets/polyfill/es6.js b/vendor/assets/polyfill/es6.js