Merge branch 'dependabot/bundler/rubocop-1.72.1' into develop

mysociety · Feb 17, 2025 · 342b63d · 342b63d
2 parents ba474b1 + 21e9597
commit 342b63d
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/.ruby-style.yml b/.ruby-style.yml
@@ -458,6 +458,9 @@ Lint/ConstantReassignment:
 Lint/ConstantResolution:
   Enabled: false
 
+Lint/CopDirectiveSyntax:
+  Enabled: false
+
 Lint/Debugger:
   Enabled: true
 
@@ -695,6 +698,9 @@ Lint/RedundantSplatExpansion:
 Lint/RedundantStringCoercion:
   Enabled: true
 
+Lint/RedundantTypeConversion:
+  Enabled: false
+
 Lint/RedundantWithIndex:
   Enabled: false
 
@@ -761,6 +767,9 @@ Lint/StructNewOverride:
 Lint/SuppressedException:
   Enabled: true
 
+Lint/SuppressedExceptionInNumberConversion:
+  Enabled: false
+
 Lint/SymbolConversion:
   Enabled: false
 
@@ -821,6 +830,9 @@ Lint/UselessAccessModifier:
 Lint/UselessAssignment:
   Enabled: false
 
+Lint/UselessConstantScoping:
+  Enabled: false
+
 Lint/UselessDefined:
   Enabled: false
 
@@ -2115,6 +2127,9 @@ Style/RedundantFileExtensionInRequire:
 Style/RedundantFilterChain:
   Enabled: false
 
+Style/RedundantFormat:
+  Enabled: false
+
 Style/RedundantFreeze:
   Enabled: true
 

diff --git a/Gemfile b/Gemfile
@@ -207,7 +207,7 @@ group :development do
       gem 'net-ssh-gateway', '>= 1.1.0', '< 3.0.0'
   gem 'launchy', '< 3.2.0'
   gem 'web-console', '>= 3.3.0'
-  gem 'rubocop', '~> 1.71.2', require: false
+  gem 'rubocop', '~> 1.72.1', require: false
   gem 'rubocop-performance', require: false
   gem 'rubocop-rails', require: false
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -330,6 +330,7 @@ GEM
     libv8-node (18.19.0.0-arm64-darwin)
     libv8-node (18.19.0.0-x86_64-darwin)
     libv8-node (18.19.0.0-x86_64-linux)
+    lint_roller (1.1.0)
     locale (2.1.4)
     logger (1.6.6)
     loofah (2.24.0)
@@ -505,9 +506,10 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.2)
-    rubocop (1.71.2)
+    rubocop (1.72.1)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
@@ -706,7 +708,7 @@ DEPENDENCIES
   rolify (~> 6.0.1)
   rspec-activemodel-mocks (~> 1.2.1)
   rspec-rails (~> 7.1.1)
-  rubocop (~> 1.71.2)
+  rubocop (~> 1.72.1)
   rubocop-performance
   rubocop-rails
   ruby-msg (~> 1.5.0)!