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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 26b5aa64b8402baec153a5c6358fe5b37c596b3c..66942d6a47c1c01168ab854b187dea49eb2c2caf 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,12 +1,26 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
 # This configuration was generated by
 # `rubocop --auto-gen-config`

-# on 2019-06-05 09:04:25 +0100 using RuboCop version 0.71.0.
+# on 2020-08-02 18:37:55 UTC using RuboCop version 0.86.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
 # versions of RuboCop, may require this file to be generated again.
 
 # 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
 # versions of RuboCop, may require this file to be generated again.
 

-# Offense count: 33
+# Work around erblint issues.
+# https://github.com/openstreetmap/openstreetmap-website/issues/2472
+require:
+  - rubocop-minitest
+  - rubocop-performance
+  - rubocop-rails
+
+# Offense count: 568
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 370
+
+# Offense count: 36

 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
   Exclude:
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
   Exclude:


@@ -25,18 +39,12 @@ Lint/AssignmentInCondition:
     - 'lib/osm.rb'
     - 'script/deliver-message'
 
     - 'lib/osm.rb'
     - 'script/deliver-message'
 

-# Offense count: 4
-# Configuration parameters: AllowComments.
-Lint/HandleExceptions:
-  Exclude:
-    - 'app/controllers/api/amf_controller.rb'
-    - 'app/controllers/users_controller.rb'
-
-# Offense count: 703
+# Offense count: 739
+# Configuration parameters: IgnoredMethods.

 Metrics/AbcSize:
 Metrics/AbcSize:

-  Max: 279
+  Max: 189

 
 

-# Offense count: 40
+# Offense count: 72

 # Configuration parameters: CountComments, ExcludedMethods.
 # ExcludedMethods: refine
 Metrics/BlockLength:
 # Configuration parameters: CountComments, ExcludedMethods.
 # ExcludedMethods: refine
 Metrics/BlockLength:


@@ -47,31 +55,28 @@ Metrics/BlockLength:
 Metrics/BlockNesting:
   Max: 5
 
 Metrics/BlockNesting:
   Max: 5
 

-# Offense count: 68
+# Offense count: 25

 # Configuration parameters: CountComments.
 Metrics/ClassLength:
 # Configuration parameters: CountComments.
 Metrics/ClassLength:

-  Max: 1397
+  Max: 645

 
 

-# Offense count: 73
+# Offense count: 68
+# Configuration parameters: IgnoredMethods.

 Metrics/CyclomaticComplexity:
 Metrics/CyclomaticComplexity:

-  Max: 22
+  Max: 28

 
 

-# Offense count: 714
+# Offense count: 735

 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 179
 
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 179
 

-# Offense count: 1
-# Configuration parameters: CountComments.
-Metrics/ModuleLength:
-  Max: 107
-

 # Offense count: 4
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 9
 
 # Offense count: 4
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 9
 

-# Offense count: 71
+# Offense count: 73
+# Configuration parameters: IgnoredMethods.

 Metrics/PerceivedComplexity:
   Max: 25
 
 Metrics/PerceivedComplexity:
   Max: 25
 


@@ -85,10 +90,10 @@ Naming/AccessorMethodName:
     - 'lib/potlatch.rb'
 
 # Offense count: 8
     - 'lib/potlatch.rb'
 
 # Offense count: 8

-# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist, MethodDefinitionMacros.
+# Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.

 # NamePrefix: is_, has_, have_
 # NamePrefix: is_, has_, have_

-# NamePrefixBlacklist: is_, has_, have_
-# NameWhitelist: is_a?
+# ForbiddenPrefixes: is_, has_, have_
+# AllowedMethods: is_a?

 # MethodDefinitionMacros: define_method, define_singleton_method
 Naming/PredicateName:
   Exclude:
 # MethodDefinitionMacros: define_method, define_singleton_method
 Naming/PredicateName:
   Exclude:


@@ -100,14 +105,13 @@ Naming/PredicateName:
     - 'app/models/user.rb'
     - 'lib/classic_pagination/pagination.rb'
 
     - 'app/models/user.rb'
     - 'lib/classic_pagination/pagination.rb'
 

-# Offense count: 6
+# Offense count: 5

 # Configuration parameters: Database, Include.
 # SupportedDatabases: mysql, postgresql
 # Include: db/migrate/*.rb
 Rails/BulkChangeTable:
   Exclude:
     - 'db/migrate/20111116184519_update_oauth.rb'
 # Configuration parameters: Database, Include.
 # SupportedDatabases: mysql, postgresql
 # Include: db/migrate/*.rb
 Rails/BulkChangeTable:
   Exclude:
     - 'db/migrate/20111116184519_update_oauth.rb'

-    - 'db/migrate/20120208122334_merge_acl_address_and_mask.rb'

     - 'db/migrate/20120208194454_add_domain_to_acl.rb'
     - 'db/migrate/20120404205604_add_user_and_description_to_redaction.rb'
 
     - 'db/migrate/20120208194454_add_domain_to_acl.rb'
     - 'db/migrate/20120404205604_add_user_and_description_to_redaction.rb'
 


@@ -119,14 +123,12 @@ Rails/HasAndBelongsToMany:
     - 'app/models/changeset.rb'
     - 'app/models/user.rb'
 
     - 'app/models/changeset.rb'
     - 'app/models/user.rb'
 

-# Offense count: 11
+# Offense count: 4

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

-    - 'app/helpers/application_helper.rb'

     - 'app/helpers/title_helper.rb'
     - 'app/helpers/title_helper.rb'

-    - 'app/helpers/trace_helper.rb'

 
 # Offense count: 5
 # Configuration parameters: Include.
 
 # Offense count: 5
 # Configuration parameters: Include.


@@ -139,7 +141,7 @@ 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: 18
+# Offense count: 19

 Rails/OutputSafety:
   Exclude:
     - 'app/controllers/users_controller.rb'
 Rails/OutputSafety:
   Exclude:
     - 'app/controllers/users_controller.rb'


@@ -152,45 +154,22 @@ Rails/OutputSafety:
     - 'lib/rich_text.rb'
     - 'test/helpers/application_helper_test.rb'
 
     - 'lib/rich_text.rb'
     - 'test/helpers/application_helper_test.rb'
 

-# Offense count: 94
+# Offense count: 95

 # 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: 1
-# Configuration parameters: AllowedChars.
-Style/AsciiComments:
-  Exclude:
-    - 'test/models/message_test.rb'
-
-# Offense count: 255
-Style/Documentation:
-  Enabled: false
-
-# Offense count: 503
+# Offense count: 572

 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.

-# SupportedStyles: always, never
+# SupportedStyles: always, always_true, never

 Style/FrozenStringLiteralComment:
   Enabled: false
 
 Style/FrozenStringLiteralComment:
   Enabled: false
 

-# Offense count: 2
-# Cop supports --auto-correct.
-Style/IfUnlessModifier:
-  Exclude:
-    - 'app/controllers/api/ways_controller.rb'
-
-# Offense count: 74
+# Offense count: 78

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

-
-# Offense count: 3320
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 1073