Merge pull request #3018 from tordans/line-break-for-long-urls

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index d70618e766295c2b5cb72271929d60db0bac136a..890fcc83cb5bcc9a4298a71931ad375c2df3ae43 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -58,7 +58,7 @@ Metrics/BlockNesting:
 # Offense count: 25
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 643
+  Max: 644
 
 # Offense count: 68
 # Configuration parameters: IgnoredMethods.
@@ -150,9 +150,6 @@ Rails/OutputSafety:
   Exclude:
     - 'app/controllers/users_controller.rb'
     - 'app/helpers/application_helper.rb'
-    - 'app/helpers/changesets_helper.rb'
-    - 'app/helpers/geocoder_helper.rb'
-    - 'app/helpers/user_blocks_helper.rb'
     - 'lib/rich_text.rb'
     - 'test/helpers/application_helper_test.rb'
 
@@ -175,24 +172,3 @@ Style/FrozenStringLiteralComment:
 # Configuration parameters: Strict.
 Style/NumericLiterals:
   MinDigits: 11
-
-# Offense count: 20
-Style/OptionalBooleanParameter:
-  Exclude:
-    - 'app/controllers/api/notes_controller.rb'
-    - 'app/controllers/application_controller.rb'
-    - 'app/helpers/browse_helper.rb'
-    - 'app/models/changeset.rb'
-    - 'app/models/node.rb'
-    - 'app/models/relation.rb'
-    - 'app/models/trace.rb'
-    - 'app/models/tracepoint.rb'
-    - 'app/models/way.rb'
-    - 'test/models/diary_entry_test.rb'
-    - 'test/models/trace_test.rb'
-    - 'test/models/tracetag_test.rb'
-
-# Offense count: 28
-# Cop supports --auto-correct.
-Style/StringConcatenation:
-  Enabled: false