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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 96bf94b8e6241dd49d91d310ad1197385caacda0..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.
@@ -172,37 +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: 19
-# Cop supports --auto-correct.
-Style/StringConcatenation:
-  Exclude:
-    - 'app/helpers/browse_tags_helper.rb'
-    - 'app/helpers/user_roles_helper.rb'
-    - 'app/jobs/trace_importer_job.rb'
-    - 'app/models/client_application.rb'
-    - 'app/views/changesets/index.atom.builder'
-    - 'lib/migrate.rb'
-    - 'lib/potlatch.rb'
-    - 'script/cleanup'
-    - 'script/deliver-message'
-    - 'script/statistics'
-    - 'script/update-spam-blocks'
-    - 'test/controllers/api/relations_controller_test.rb'
-    - 'test/helpers/user_roles_helper_test.rb'