diff --git a/Gemfile b/Gemfile index 0cd63548a4f..c003640842b 100644 --- a/Gemfile +++ b/Gemfile @@ -140,7 +140,7 @@ gem "rack-attack", "~> 6.7.0" gem "secure_headers", "~> 6.5.0" # Browser detection for incompatibility checks -gem "browser", "~> 5.3.0" +gem "browser", "~> 6.0.0" # Providing health checks gem "okcomputer", "~> 1.18.1" diff --git a/Gemfile.lock b/Gemfile.lock index fb9ff45abd0..327b2e5ab26 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -385,7 +385,7 @@ GEM msgpack (~> 1.2) brakeman (6.1.2) racc - browser (5.3.1) + browser (6.0.0) builder (3.2.4) byebug (11.1.3) capybara (3.40.0) @@ -1179,7 +1179,7 @@ DEPENDENCIES bcrypt (~> 3.1.6) bootsnap (~> 1.18.0) brakeman (~> 6.1.0) - browser (~> 5.3.0) + browser (~> 6.0.0) budgets! capybara (~> 3.40.0) capybara-screenshot (~> 1.0.17) diff --git a/app/helpers/browser_helper.rb b/app/helpers/browser_helper.rb index 73e076d2111..b0532391694 100644 --- a/app/helpers/browser_helper.rb +++ b/app/helpers/browser_helper.rb @@ -14,13 +14,13 @@ module BrowserHelper # Older versions behind last ESR FF return true if browser.firefox? && version < 101 - # Chrome versions older than a year - return true if browser.chrome? && version < 109 + # Chrome/chromium based Edge based versions older than a year + return true if browser.chromium_based? && version < 109 # Older version of safari return true if browser.safari? && version < 16 - # Older version of EDGE + # Older version of non-chromium based Edge return true if browser.edge? && version < 109 false @@ -32,7 +32,7 @@ module BrowserHelper # or mobile detection def browser_specific_classes [].tap do |classes| - classes << "-browser-chrome" if browser.chrome? + classes << "-browser-chrome" if browser.chrome? || browser.chromium_based? classes << "-browser-firefox" if browser.firefox? classes << "-browser-safari" if browser.safari? classes << "-browser-edge" if browser.edge?