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

[rails.git] / .rubocop_todo.yml

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

-# on 2015-08-18 20:27:49 +0100 using RuboCop version 0.33.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: 34
-Lint/AmbiguousOperator:
-  Exclude:
-    - 'test/controllers/amf_controller_test.rb'
-    - 'test/controllers/changeset_controller_test.rb'
-    - 'test/lib/bounding_box_test.rb'
-    - 'test/lib/country_test.rb'
+# Work around erblint issues.
+# https://github.com/openstreetmap/openstreetmap-website/issues/2472
+require:
+  - rubocop-minitest
+  - rubocop-performance
+  - rubocop-rails

 
 

-# Offense count: 115
-Lint/AmbiguousRegexpLiteral:
-  Enabled: false
+# Offense count: 568
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 370

 
 

-# Offense count: 29
+# Offense count: 36

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

+    - 'app/controllers/api/traces_controller.rb'
+    - 'app/controllers/api/user_preferences_controller.rb'

     - 'app/controllers/application_controller.rb'
     - 'app/controllers/geocoder_controller.rb'
     - 'app/controllers/notes_controller.rb'
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/geocoder_controller.rb'
     - 'app/controllers/notes_controller.rb'

-    - 'app/controllers/trace_controller.rb'
-    - 'app/controllers/user_controller.rb'
-    - 'app/controllers/user_preference_controller.rb'
+    - 'app/controllers/traces_controller.rb'
+    - 'app/controllers/users_controller.rb'

     - 'app/helpers/application_helper.rb'
     - 'app/helpers/application_helper.rb'

-    - 'app/helpers/browse_helper.rb'
+    - 'app/helpers/browse_tags_helper.rb'
+    - 'app/mailers/notifier.rb'

     - 'app/models/client_application.rb'
     - 'app/models/client_application.rb'

-    - 'app/models/notifier.rb'

     - 'lib/nominatim.rb'
     - 'lib/osm.rb'
     - 'script/deliver-message'
 
     - 'lib/nominatim.rb'
     - 'lib/osm.rb'
     - 'script/deliver-message'
 

-# Offense count: 3
-Lint/FormatParameterMismatch:
-  Exclude:
-    - 'app/controllers/swf_controller.rb'
-
-# Offense count: 5
-Lint/HandleExceptions:
-  Exclude:
-    - 'app/controllers/amf_controller.rb'
-    - 'app/controllers/user_controller.rb'
-    - 'config/initializers/session.rb'
-
-# Offense count: 8
-Lint/ParenthesesAsGroupedExpression:
-  Exclude:
-    - 'test/controllers/amf_controller_test.rb'
-    - 'test/lib/bounding_box_test.rb'
-    - 'test/models/user_preference_test.rb'
-
-# Offense count: 671
+# Offense count: 739
+# Configuration parameters: IgnoredMethods.

 Metrics/AbcSize:
 Metrics/AbcSize:

-  Max: 277
+  Max: 189
+
+# Offense count: 72
+# Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
+Metrics/BlockLength:
+  Max: 71

 
 

-# Offense count: 12
+# Offense count: 15
+# Configuration parameters: CountBlocks.

 Metrics/BlockNesting:
   Max: 5
 
 Metrics/BlockNesting:
   Max: 5
 

-# Offense count: 62
+# Offense count: 25

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

-  Max: 1653
+  Max: 645

 
 

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

 Metrics/CyclomaticComplexity:
 Metrics/CyclomaticComplexity:

-  Max: 20
-
-# Offense count: 2535
-# Configuration parameters: AllowURI, URISchemes.
-Metrics/LineLength:
-  Max: 962
+  Max: 28

 
 

-# Offense count: 628
-# Configuration parameters: CountComments.
+# Offense count: 735
+# Configuration parameters: CountComments, ExcludedMethods.

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

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

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

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

 Metrics/PerceivedComplexity:
 Metrics/PerceivedComplexity:

-  Max: 23
+  Max: 25

 
 

-# Offense count: 2
-# Configuration parameters: Include.
-Rails/HasAndBelongsToMany:
-  Exclude:
-    - 'app/models/changeset.rb'
-    - 'app/models/user.rb'
-
-# Offense count: 66
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Rails/TimeZone:
-  Enabled: false
-
-# Offense count: 5
-Style/AccessorMethodName:
+# Offense count: 6
+Naming/AccessorMethodName:

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


@@ -117,88 +89,87 @@ Style/AccessorMethodName:
     - 'lib/osm.rb'
     - 'lib/potlatch.rb'
 
     - 'lib/osm.rb'
     - 'lib/potlatch.rb'
 

-# Offense count: 1
-Style/AsciiComments:
+# Offense count: 8
+# Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
+# NamePrefix: is_, has_, have_
+# ForbiddenPrefixes: is_, has_, have_
+# AllowedMethods: is_a?
+# MethodDefinitionMacros: define_method, define_singleton_method
+Naming/PredicateName:

   Exclude:
   Exclude:

-    - 'test/models/message_test.rb'
+    - 'spec/**/*'
+    - 'app/models/changeset.rb'
+    - 'app/models/old_node.rb'
+    - 'app/models/old_relation.rb'
+    - 'app/models/old_way.rb'
+    - 'app/models/user.rb'
+    - 'lib/classic_pagination/pagination.rb'

 
 

-# Offense count: 310
-Style/Documentation:
-  Enabled: false
+# Offense count: 5
+# Configuration parameters: Database, Include.
+# SupportedDatabases: mysql, postgresql
+# Include: db/migrate/*.rb
+Rails/BulkChangeTable:
+  Exclude:
+    - 'db/migrate/20111116184519_update_oauth.rb'
+    - 'db/migrate/20120208194454_add_domain_to_acl.rb'
+    - 'db/migrate/20120404205604_add_user_and_description_to_redaction.rb'

 
 

-# Offense count: 38
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
+# Offense count: 2
+# Configuration parameters: Include.
+# Include: app/models/**/*.rb
+Rails/HasAndBelongsToMany:

   Exclude:
   Exclude:

-    - 'app/controllers/application_controller.rb'
-    - 'app/controllers/diary_entry_controller.rb'
-    - 'app/controllers/message_controller.rb'
-    - 'app/controllers/notes_controller.rb'
-    - 'app/controllers/site_controller.rb'
-    - 'app/controllers/user_blocks_controller.rb'
-    - 'app/controllers/user_controller.rb'
-    - 'app/controllers/user_roles_controller.rb'
-    - 'app/helpers/application_helper.rb'

     - 'app/models/changeset.rb'
     - 'app/models/user.rb'
     - 'app/models/changeset.rb'
     - 'app/models/user.rb'

-    - 'lib/diff_reader.rb'
-    - 'lib/object_metadata.rb'

 
 

-# Offense count: 60
-# Cop supports --auto-correct.
-Style/LineEndConcatenation:
+# Offense count: 4
+# Configuration parameters: Include.
+# Include: app/helpers/**/*.rb
+Rails/HelperInstanceVariable:

   Exclude:
   Exclude:

-    - 'db/migrate/008_remove_segments.rb'
-    - 'db/migrate/020_populate_node_tags_and_remove.rb'
-    - 'db/migrate/023_add_changesets.rb'
-    - 'lib/bounding_box.rb'
-    - 'lib/diff_reader.rb'
-    - 'lib/osm.rb'
-    - 'test/controllers/changeset_controller_test.rb'
-    - 'test/controllers/node_controller_test.rb'
-    - 'test/controllers/relation_controller_test.rb'
-    - 'test/controllers/way_controller_test.rb'
-
-# Offense count: 69
-# Cop supports --auto-correct.
-Style/NumericLiterals:
-  MinDigits: 11
+    - 'app/helpers/title_helper.rb'

 
 

-# Offense count: 42
-# Cop supports --auto-correct.
-Style/PerlBackrefs:
+# Offense count: 5
+# Configuration parameters: Include.
+# Include: db/migrate/*.rb
+Rails/NotNullColumn:

   Exclude:
   Exclude:

-    - 'app/controllers/amf_controller.rb'
-    - 'app/controllers/application_controller.rb'
-    - 'app/helpers/browse_helper.rb'
-    - 'config/initializers/paperclip.rb'
-    - 'lib/id.rb'
-    - 'lib/potlatch.rb'
-    - 'test/lib/i18n_test.rb'
+    - 'db/migrate/002_cleanup_osm_db.rb'
+    - 'db/migrate/020_populate_node_tags_and_remove.rb'
+    - 'db/migrate/021_move_to_innodb.rb'
+    - 'db/migrate/025_add_end_time_to_changesets.rb'
+    - 'db/migrate/20120404205604_add_user_and_description_to_redaction.rb'

 
 

-# Offense count: 8
-# Configuration parameters: NamePrefix, NamePrefixBlacklist.
-Style/PredicateName:
+# Offense count: 19
+Rails/OutputSafety:

   Exclude:
   Exclude:

-    - 'app/models/changeset.rb'
-    - 'app/models/old_node.rb'
-    - 'app/models/old_relation.rb'
-    - 'app/models/old_way.rb'
-    - 'app/models/user.rb'
-    - 'lib/classic_pagination/pagination.rb'
-
-# Offense count: 97
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/RaiseArgs:
+    - 'app/controllers/users_controller.rb'
+    - 'app/helpers/application_helper.rb'
+    - 'app/helpers/changesets_helper.rb'
+    - 'app/helpers/geocoder_helper.rb'
+    - 'app/helpers/note_helper.rb'
+    - 'app/helpers/open_graph_helper.rb'
+    - 'app/helpers/user_blocks_helper.rb'
+    - 'lib/rich_text.rb'
+    - 'test/helpers/application_helper_test.rb'
+
+# Offense count: 95
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: strict, flexible
+Rails/TimeZone:

   Enabled: false
 
   Enabled: false
 

-# Offense count: 2
-Style/RescueModifier:
-  Exclude:
-    - 'app/helpers/browse_helper.rb'
-
-# Offense count: 8
+# Offense count: 572

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

-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/StringLiteralsInInterpolation:
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, always_true, never
+Style/FrozenStringLiteralComment:

   Enabled: false
   Enabled: false

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