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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 95e3be8febbabc95db4766080f68b8722b857ec1..240e46c31b9180a8d3a20bd2daf5d98f3c8b1849 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -21,19 +21,6 @@ require:
 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:
@@ -54,15 +41,6 @@ Lint/AssignmentInCondition:
     - 'lib/osm.rb'
     - 'script/deliver-message'
 
-# Offense count: 7
-# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
-Lint/DuplicateBranch:
-  Exclude:
-    - 'app/controllers/api_controller.rb'
-    - 'app/controllers/diary_entries_controller.rb'
-    - 'app/controllers/geocoder_controller.rb'
-    - 'app/helpers/browse_tags_helper.rb'
-
 # Offense count: 665
 # Configuration parameters: IgnoredMethods, CountRepeatedAttributes.
 Metrics/AbcSize:
@@ -82,7 +60,7 @@ Metrics/BlockNesting:
 # Offense count: 25
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 313
+  Max: 316
 
 # Offense count: 58
 # Configuration parameters: IgnoredMethods.
@@ -108,12 +86,10 @@ Metrics/PerceivedComplexity:
 Minitest/MultipleAssertions:
   Max: 52
 
-# Offense count: 3
+# Offense count: 1
 Naming/AccessorMethodName:
   Exclude:
-    - 'app/controllers/application_controller.rb'
     - 'app/helpers/title_helper.rb'
-    - 'lib/osm.rb'
 
 # Offense count: 8
 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.