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

mysociety · Nov 4, 2024 · 32dfc08 · 32dfc08
2 parents c36f362 + 08ca693
commit 32dfc08
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/.ruby-style.yml b/.ruby-style.yml
@@ -770,6 +770,9 @@ Lint/TripleQuotes:
 Lint/UnderscorePrefixedVariableName:
   Enabled: true
 
+Lint/UnescapedBracketInRegexp:
+  Enabled: false
+
 Lint/UnexpectedBlockArity:
   Enabled: false
 
@@ -1507,6 +1510,9 @@ Style/AccessorGrouping:
 Style/Alias:
   Enabled: true
 
+Style/AmbiguousEndlessMethodDefinition:
+  Enabled: false
+
 Style/AndOr:
   Enabled: true
 
@@ -1543,6 +1549,9 @@ Style/BeginBlock:
 Style/BisectedAttrAccessor:
   Enabled: false
 
+Style/BitwisePredicate:
+  Enabled: false
+
 Style/BlockComments:
   Enabled: true
 
@@ -1590,6 +1599,9 @@ Style/ColonMethodCall:
 Style/ColonMethodDefinition:
   Enabled: false
 
+Style/CombinableDefined:
+  Enabled: false
+
 Style/CombinableLoops:
   Enabled: false
 
@@ -1814,6 +1826,9 @@ Style/InvertibleUnlessCondition:
 Style/IpAddresses:
   Enabled: false
 
+Style/KeywordArgumentsMerging:
+  Enabled: false
+
 Style/KeywordParametersOrder:
   Enabled: false
 
@@ -2136,6 +2151,9 @@ Style/ReturnNilInPredicateMethodDefinition:
 Style/SafeNavigation:
   Enabled: false
 
+Style/SafeNavigationChainLength:
+  Enabled: false
+
 Style/Sample:
   Enabled: false
 

diff --git a/Gemfile b/Gemfile
@@ -201,7 +201,7 @@ group :development do
       gem 'net-ssh-gateway', '>= 1.1.0', '< 3.0.0'
   gem 'launchy', '< 3.1.0'
   gem 'web-console', '>= 3.3.0'
-  gem 'rubocop', '~> 1.67.0', require: false
+  gem 'rubocop', '~> 1.68.0', require: false
   gem 'rubocop-performance', require: false
   gem 'rubocop-rails', require: false
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -364,7 +364,7 @@ GEM
     os (1.1.4)
     ostruct (0.6.0)
     parallel (1.26.3)
-    parser (3.3.5.0)
+    parser (3.3.5.1)
       ast (~> 2.4.1)
       racc
     pg (1.5.9)
@@ -457,7 +457,7 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.1)
-    rubocop (1.67.0)
+    rubocop (1.68.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -467,7 +467,7 @@ GEM
       rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.3)
+    rubocop-ast (1.33.1)
       parser (>= 3.3.1.0)
     rubocop-performance (1.22.1)
       rubocop (>= 1.48.1, < 2.0)
@@ -641,7 +641,7 @@ DEPENDENCIES
   rolify (~> 6.0.1)
   rspec-activemodel-mocks (~> 1.2.1)
   rspec-rails (~> 7.0.1)
-  rubocop (~> 1.67.0)
+  rubocop (~> 1.68.0)
   rubocop-performance
   rubocop-rails
   ruby-msg (~> 1.5.0)!