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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index ee559e4b630499bfb3bb5bdb4dc82aa74e548ecd..06a9c76f07b2ac4dcf2752113aa2cfee8dc5f45b 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -6,6 +6,19 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Work around erblint issues.
+# https://github.com/openstreetmap/openstreetmap-website/issues/2472
+require:
+  - rubocop-performance
+  - rubocop-rails
+
+# Offense count: 3338
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 260
+
 # Offense count: 35
 # Configuration parameters: AllowSafeAssignment.
 Lint/AssignmentInCondition:
@@ -27,10 +40,11 @@ Lint/AssignmentInCondition:
 
 # Offense count: 4
 # Configuration parameters: AllowComments.
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Exclude:
     - 'app/controllers/api/amf_controller.rb'
     - 'app/controllers/users_controller.rb'
+    - 'app/controllers/site_controller.rb'
 
 # Offense count: 701
 Metrics/AbcSize:
@@ -173,16 +187,13 @@ Style/AsciiComments:
   Exclude:
     - 'test/models/message_test.rb'
 
-# Offense count: 263
-Style/Documentation:
-  Enabled: false
-
 # 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'
@@ -207,10 +218,3 @@ Style/IfUnlessModifier:
 # Configuration parameters: Strict.
 Style/NumericLiterals:
   MinDigits: 11
-
-# Offense count: 3338
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 307