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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 345eed6744509ad163d67baffff1437cdd51e687..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-09-14 19:29:59 UTC using RuboCop version 1.21.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,7 +14,7 @@ require:
   - rubocop-rails
   - rubocop-rake
 
-# Offense count: 524
+# Offense count: 544
 # Cop supports --auto-correct.
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
@@ -38,9 +38,9 @@ Lint/AmbiguousOperatorPrecedence:
 # 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/accounts_controller.rb'
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/geocoder_controller.rb'
     - 'app/controllers/notes_controller.rb'
@@ -54,7 +54,7 @@ Lint/AssignmentInCondition:
     - 'lib/osm.rb'
     - 'script/deliver-message'
 
-# Offense count: 8
+# Offense count: 7
 # Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
 Lint/DuplicateBranch:
   Exclude:
@@ -62,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: 643
+# Offense count: 663
 # Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 189
 
-# Offense count: 69
+# Offense count: 72
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 # IgnoredMethods: refine
 Metrics/BlockLength:
@@ -83,14 +82,14 @@ Metrics/BlockNesting:
 # Offense count: 25
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 337
+  Max: 313
 
-# Offense count: 58
+# Offense count: 57
 # Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 25
 
-# Offense count: 716
+# Offense count: 739
 # Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
 Metrics/MethodLength:
   Max: 179
@@ -100,14 +99,14 @@ Metrics/MethodLength:
 Metrics/ParameterLists:
   Max: 6
 
-# Offense count: 62
+# Offense count: 59
 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 26
 
-# Offense count: 528
+# Offense count: 549
 Minitest/MultipleAssertions:
-  Max: 54
+  Max: 52
 
 # Offense count: 3
 Naming/AccessorMethodName:
@@ -162,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.
@@ -183,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
@@ -199,15 +204,15 @@ Rake/Desc:
     - 'lib/tasks/subscribe_diary_authors.rake'
     - 'lib/tasks/subscribe_old_changesets.rake'
 
-# Offense count: 602
+# 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