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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 366058e7d154672a8b67947ccc1df4083100a634..66942d6a47c1c01168ab854b187dea49eb2c2caf 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2019-10-19 16:05:52 +0000 using RuboCop version 0.75.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
@@ -13,14 +13,14 @@ require:
   - rubocop-performance
   - rubocop-rails
 
-# Offense count: 3338
+# Offense count: 568
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 370
 
-# Offense count: 35
+# Offense count: 36
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
   Exclude:
@@ -39,19 +39,12 @@ Lint/AssignmentInCondition:
     - 'lib/osm.rb'
     - 'script/deliver-message'
 
-# Offense count: 4
-# Configuration parameters: AllowComments.
-Lint/SuppressedException:
-  Exclude:
-    - 'app/controllers/api/amf_controller.rb'
-    - 'app/controllers/users_controller.rb'
-    - 'app/controllers/site_controller.rb'
-
-# Offense count: 701
+# Offense count: 739
+# Configuration parameters: IgnoredMethods.
 Metrics/AbcSize:
   Max: 189
 
-# Offense count: 39
+# Offense count: 72
 # Configuration parameters: CountComments, ExcludedMethods.
 # ExcludedMethods: refine
 Metrics/BlockLength:
@@ -67,26 +60,23 @@ Metrics/BlockNesting:
 Metrics/ClassLength:
   Max: 645
 
-# Offense count: 74
+# Offense count: 68
+# Configuration parameters: IgnoredMethods.
 Metrics/CyclomaticComplexity:
   Max: 28
 
-# Offense count: 722
+# Offense count: 735
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/MethodLength:
   Max: 179
 
-# Offense count: 2
-# Configuration parameters: CountComments.
-Metrics/ModuleLength:
-  Max: 117
-
 # Offense count: 4
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 9
 
-# Offense count: 72
+# Offense count: 73
+# Configuration parameters: IgnoredMethods.
 Metrics/PerceivedComplexity:
   Max: 25
 
@@ -100,10 +90,10 @@ Naming/AccessorMethodName:
     - 'lib/potlatch.rb'
 
 # Offense count: 8
-# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist, MethodDefinitionMacros.
+# Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
 # 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:
@@ -116,21 +106,12 @@ Naming/PredicateName:
     - 'lib/classic_pagination/pagination.rb'
 
 # Offense count: 5
-# Cop supports --auto-correct.
-Performance/RegexpMatch:
-  Exclude:
-    - 'app/helpers/browse_tags_helper.rb'
-    - 'app/validators/characters_validator.rb'
-    - 'app/validators/whitespace_validator.rb'
-
-# Offense count: 6
 # 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'
 
@@ -142,14 +123,12 @@ Rails/HasAndBelongsToMany:
     - 'app/models/changeset.rb'
     - 'app/models/user.rb'
 
-# Offense count: 11
+# Offense count: 4
 # Configuration parameters: Include.
 # Include: app/helpers/**/*.rb
 Rails/HelperInstanceVariable:
   Exclude:
-    - 'app/helpers/application_helper.rb'
     - 'app/helpers/title_helper.rb'
-    - 'app/helpers/trace_helper.rb'
 
 # Offense count: 5
 # Configuration parameters: Include.
@@ -162,7 +141,7 @@ Rails/NotNullColumn:
     - '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'
@@ -175,46 +154,21 @@ Rails/OutputSafety:
     - '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
 
-# Offense count: 1
-# Configuration parameters: AllowedChars.
-Style/AsciiComments:
-  Exclude:
-    - 'test/models/message_test.rb'
-
-# Offense count: 27
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: annotated, template, unannotated
-Style/FormatStringToken:
-  Exclude:
-    - 'app/models/concerns/geo_record.rb'
-    - 'app/views/api/map/_bounds.xml.builder'
-    - 'lib/bounding_box.rb'
-    - 'test/controllers/api/map_controller_test.rb'
-    - 'test/controllers/api/relations_controller_test.rb'
-    - 'test/controllers/api/ways_controller_test.rb'
-    - 'test/lib/bounding_box_test.rb'
-
-# Offense count: 539
+# Offense count: 572
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
-# SupportedStyles: always, never
+# SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/IfUnlessModifier:
-  Exclude:
-    - 'app/controllers/api/ways_controller.rb'
-
-# Offense count: 70
+# Offense count: 78
 # Cop supports --auto-correct.
 # Configuration parameters: Strict.
 Style/NumericLiterals: