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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 64781f9192182e6cf25894c52ef6e79dfba67dfb..2e7bc2f5957977b7faf4c9801f439d1e4f6803dc 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -21,19 +21,6 @@ require:
 Layout/LineLength:
   Max: 270
 
 Layout/LineLength:
   Max: 270
 

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


@@ -99,12 +86,10 @@ Metrics/PerceivedComplexity:
 Minitest/MultipleAssertions:
   Max: 52
 
 Minitest/MultipleAssertions:
   Max: 52
 

-# Offense count: 3
+# Offense count: 1

 Naming/AccessorMethodName:
   Exclude:
 Naming/AccessorMethodName:
   Exclude:

-    - 'app/controllers/application_controller.rb'

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

-    - 'lib/osm.rb'

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