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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 890fcc83cb5bcc9a4298a71931ad375c2df3ae43..90bfaa8f9d77c2844f061eae784d4bc503120953 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
 # This configuration was generated by
 # `rubocop --auto-gen-config`

-# on 2020-09-02 06:16:56 UTC using RuboCop version 0.90.0.
+# on 2021-09-14 19:29:59 UTC using RuboCop version 1.21.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
 # 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


@@ -12,15 +12,29 @@ require:
   - rubocop-minitest
   - rubocop-performance
   - rubocop-rails
   - rubocop-minitest
   - rubocop-performance
   - rubocop-rails

+  - rubocop-rake

 
 

-# Offense count: 568
+# Offense count: 524

 # Cop supports --auto-correct.
 # Cop supports --auto-correct.

-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.

 # URISchemes: http, https
 Layout/LineLength:
 # URISchemes: http, https
 Layout/LineLength:

-  Max: 250
+  Max: 270

 
 

-# Offense count: 36
+# 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:
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
   Exclude:


@@ -39,14 +53,24 @@ Lint/AssignmentInCondition:
     - 'lib/osm.rb'
     - 'script/deliver-message'
 
     - 'lib/osm.rb'
     - 'script/deliver-message'
 

-# Offense count: 682
-# Configuration parameters: IgnoredMethods.
+# Offense count: 8
+# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
+Lint/DuplicateBranch:
+  Exclude:
+    - 'app/controllers/api_controller.rb'
+    - 'app/controllers/diary_entries_controller.rb'
+    - 'app/controllers/geocoder_controller.rb'
+    - 'app/helpers/browse_tags_helper.rb'
+    - 'lib/password_hash.rb'
+
+# Offense count: 643
+# Configuration parameters: IgnoredMethods, CountRepeatedAttributes.

 Metrics/AbcSize:
 Metrics/AbcSize:

-  Max: 194
+  Max: 189

 
 

-# Offense count: 72
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
-# ExcludedMethods: refine
+# Offense count: 69
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
+# IgnoredMethods: refine

 Metrics/BlockLength:
   Max: 71
 
 Metrics/BlockLength:
   Max: 71
 


@@ -58,40 +82,38 @@ Metrics/BlockNesting:
 # Offense count: 25
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
 # Offense count: 25
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:

-  Max: 644
+  Max: 337

 
 

-# Offense count: 68
+# Offense count: 58

 # Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
 # Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:

-  Max: 26
+  Max: 25

 
 

-# Offense count: 735
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods.
+# Offense count: 716
+# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.

 Metrics/MethodLength:
   Max: 179
 
 Metrics/MethodLength:
   Max: 179
 

-# Offense count: 4
-# Configuration parameters: CountKeywordArgs.
+# Offense count: 1
+# Configuration parameters: CountKeywordArgs, MaxOptionalParameters.

 Metrics/ParameterLists:
 Metrics/ParameterLists:

-  Max: 9
+  Max: 6

 
 

-# Offense count: 69
+# Offense count: 62

 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 26
 
 # Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 26
 

-# Offense count: 540
+# Offense count: 528

 Minitest/MultipleAssertions:
 Minitest/MultipleAssertions:

-  Max: 81
+  Max: 54

 
 

-# Offense count: 6
+# Offense count: 3

 Naming/AccessorMethodName:
   Exclude:
     - 'app/controllers/application_controller.rb'
     - 'app/helpers/title_helper.rb'
 Naming/AccessorMethodName:
   Exclude:
     - 'app/controllers/application_controller.rb'
     - 'app/helpers/title_helper.rb'

-    - 'app/models/old_way.rb'

     - 'lib/osm.rb'
     - 'lib/osm.rb'

-    - 'lib/potlatch.rb'

 
 # Offense count: 8
 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
 
 # Offense count: 8
 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.


@@ -101,7 +123,6 @@ Naming/AccessorMethodName:
 # MethodDefinitionMacros: define_method, define_singleton_method
 Naming/PredicateName:
   Exclude:
 # MethodDefinitionMacros: define_method, define_singleton_method
 Naming/PredicateName:
   Exclude:

-    - 'spec/**/*'

     - 'app/models/changeset.rb'
     - 'app/models/old_node.rb'
     - 'app/models/old_relation.rb'
     - 'app/models/changeset.rb'
     - 'app/models/old_node.rb'
     - 'app/models/old_relation.rb'


@@ -127,13 +148,20 @@ Rails/HasAndBelongsToMany:
     - 'app/models/changeset.rb'
     - 'app/models/user.rb'
 
     - 'app/models/changeset.rb'
     - 'app/models/user.rb'
 

-# Offense count: 4
+# Offense count: 3

 # Configuration parameters: Include.
 # Include: app/helpers/**/*.rb
 Rails/HelperInstanceVariable:
   Exclude:
     - 'app/helpers/title_helper.rb'
 
 # Configuration parameters: Include.
 # Include: app/helpers/**/*.rb
 Rails/HelperInstanceVariable:
   Exclude:
     - 'app/helpers/title_helper.rb'
 

+# Offense count: 1
+# Configuration parameters: Include.
+# Include: app/controllers/**/*.rb
+Rails/LexicallyScopedActionFilter:
+  Exclude:
+    - 'app/controllers/oauth2_applications_controller.rb'
+

 # Offense count: 5
 # Configuration parameters: Include.
 # Include: db/migrate/*.rb
 # Offense count: 5
 # Configuration parameters: Include.
 # Include: db/migrate/*.rb


@@ -145,30 +173,40 @@ Rails/NotNullColumn:
     - 'db/migrate/025_add_end_time_to_changesets.rb'
     - 'db/migrate/20120404205604_add_user_and_description_to_redaction.rb'
 
     - 'db/migrate/025_add_end_time_to_changesets.rb'
     - 'db/migrate/20120404205604_add_user_and_description_to_redaction.rb'
 

-# Offense count: 19
+# Offense count: 9

 Rails/OutputSafety:
   Exclude:
 Rails/OutputSafety:
   Exclude:

+    - 'app/controllers/sessions_controller.rb'

     - 'app/controllers/users_controller.rb'
     - 'app/helpers/application_helper.rb'
     - 'lib/rich_text.rb'
     - 'test/helpers/application_helper_test.rb'
 
     - 'app/controllers/users_controller.rb'
     - 'app/helpers/application_helper.rb'
     - 'lib/rich_text.rb'
     - 'test/helpers/application_helper_test.rb'
 

-# Offense count: 95
+# Offense count: 91

 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: strict, flexible
 Rails/TimeZone:
   Enabled: false
 
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: strict, flexible
 Rails/TimeZone:
   Enabled: false
 

-# Offense count: 572
+# Offense count: 6
+# Cop supports --auto-correct.
+Rake/Desc:
+  Exclude:
+    - 'lib/tasks/auto_annotate_models.rake'
+    - 'lib/tasks/eslint.rake'
+    - 'lib/tasks/subscribe_diary_authors.rake'
+    - 'lib/tasks/subscribe_old_changesets.rake'
+
+# Offense count: 602

 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Enabled: false
 
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Enabled: false
 

-# Offense count: 78
+# Offense count: 73

 # Cop supports --auto-correct.
 # Configuration parameters: Strict.
 Style/NumericLiterals:
 # Cop supports --auto-correct.
 # Configuration parameters: Strict.
 Style/NumericLiterals:

-  MinDigits: 11
+  MinDigits: 15