Merge remote-tracking branch 'upstream/pull/3446'

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 32514771cffbe6ad4ffa692b8032df38d8bc4cc2..8c0827ab7d357f1bc2548d8200f27b2cc47a741a 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-06-29 17:25:37 UTC using RuboCop version 1.18.0.
+# on 2021-12-28 19:44:27 UTC using RuboCop version 1.24.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -14,17 +14,31 @@ require:
   - rubocop-rails
   - rubocop-rake
 
-# Offense count: 510
+# Offense count: 544
 # Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 270
 
+# Offense count: 62
+# Cop supports --auto-correct.
+Lint/AmbiguousOperatorPrecedence:
+  Exclude:
+    - 'app/controllers/geocoder_controller.rb'
+    - 'app/models/user.rb'
+    - 'lib/bounding_box.rb'
+    - 'lib/osm.rb'
+    - 'lib/rich_text.rb'
+    - 'lib/short_link.rb'
+    - 'test/controllers/api/old_nodes_controller_test.rb'
+    - 'test/lib/short_link_test.rb'
+
 # Offense count: 34
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
   Exclude:
+    - 'app/controllers/accounts_controller.rb'
     - 'app/controllers/api/traces_controller.rb'
     - 'app/controllers/api/user_preferences_controller.rb'
     - 'app/controllers/application_controller.rb'
@@ -40,7 +54,7 @@ Lint/AssignmentInCondition:
     - 'lib/osm.rb'
     - 'script/deliver-message'
 
-# Offense count: 8
+# Offense count: 7
 # Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
 Lint/DuplicateBranch:
   Exclude:
@@ -48,14 +62,13 @@ Lint/DuplicateBranch:
     - 'app/controllers/diary_entries_controller.rb'
     - 'app/controllers/geocoder_controller.rb'
     - 'app/helpers/browse_tags_helper.rb'
-    - 'lib/password_hash.rb'
 
-# Offense count: 631
+# Offense count: 663
 # Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 235
+  Max: 189
 
-# Offense count: 68
+# Offense count: 72
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 # IgnoredMethods: refine
 Metrics/BlockLength:
@@ -69,14 +82,14 @@ Metrics/BlockNesting:
 # Offense count: 25
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 361
+  Max: 313
 
-# Offense count: 56
+# Offense count: 57
 # Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 25
 
-# Offense count: 703
+# Offense count: 739
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
   Max: 179
@@ -86,37 +99,22 @@ Metrics/MethodLength:
 Metrics/ParameterLists:
   Max: 6
 
-# Offense count: 60
+# Offense count: 59
 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 26
 
-# Offense count: 519
+# Offense count: 549
 Minitest/MultipleAssertions:
-  Max: 88
+  Max: 52
 
-# Offense count: 4
+# Offense count: 3
 Naming/AccessorMethodName:
   Exclude:
     - 'app/controllers/application_controller.rb'
     - 'app/helpers/title_helper.rb'
     - 'lib/osm.rb'
 
-# Offense count: 21
-# Configuration parameters: CheckIdentifiers, CheckConstants, CheckVariables, CheckStrings, CheckSymbols, CheckComments, CheckFilepaths, FlaggedTerms.
-Naming/InclusiveLanguage:
-  Exclude:
-    - 'app/controllers/sessions_controller.rb'
-    - 'app/controllers/users_controller.rb'
-    - 'app/helpers/browse_tags_helper.rb'
-    - 'app/views/api/capabilities/show.builder'
-    - 'app/views/confirmations/_resend_success_flash.html.erb'
-    - 'app/views/users/suspended.html.erb'
-    - 'config/environments/production.rb'
-    - 'config/initializers/canonical_rails.rb'
-    - 'config/initializers/config.rb'
-    - 'config/initializers/doorkeeper.rb'
-
 # Offense count: 8
 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
 # NamePrefix: is_, has_, have_
@@ -163,6 +161,7 @@ Rails/HelperInstanceVariable:
 Rails/LexicallyScopedActionFilter:
   Exclude:
     - 'app/controllers/oauth2_applications_controller.rb'
+    - 'app/controllers/oauth2_authorizations_controller.rb'
 
 # Offense count: 5
 # Configuration parameters: Include.
@@ -184,7 +183,12 @@ Rails/OutputSafety:
     - 'lib/rich_text.rb'
     - 'test/helpers/application_helper_test.rb'
 
-# Offense count: 91
+# Offense count: 23
+# Cop supports --auto-correct.
+Rails/RedundantPresenceValidationOnBelongsTo:
+  Enabled: false
+
+# Offense count: 90
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: strict, flexible
@@ -200,15 +204,15 @@ Rake/Desc:
     - 'lib/tasks/subscribe_diary_authors.rake'
     - 'lib/tasks/subscribe_old_changesets.rake'
 
-# Offense count: 597
+# Offense count: 609
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-# Offense count: 73
+# Offense count: 72
 # Cop supports --auto-correct.
-# Configuration parameters: Strict.
+# Configuration parameters: Strict, AllowedNumbers.
 Style/NumericLiterals:
   MinDigits: 15