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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index cac193504b23fd2e5166998a8d07a81e50ac5cf7..f7ee886c99cbf23ebec6cd5fa465707c2f2a589c 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -12,13 +12,14 @@ require:
   - rubocop-minitest
   - rubocop-performance
   - rubocop-rails
+  - rubocop-rake
 
 # Offense count: 544
 # Cop supports --auto-correct.
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  Max: 254
+  Max: 270
 
 # Offense count: 36
 # Configuration parameters: AllowSafeAssignment.
@@ -68,7 +69,7 @@ Metrics/BlockNesting:
 # Offense count: 24
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 582
+  Max: 587
 
 # Offense count: 52
 # Configuration parameters: IgnoredMethods.
@@ -155,6 +156,7 @@ Rails/NotNullColumn:
 # Offense count: 8
 Rails/OutputSafety:
   Exclude:
+    - 'app/controllers/sessions_controller.rb'
     - 'app/controllers/users_controller.rb'
     - 'app/helpers/application_helper.rb'
     - 'lib/rich_text.rb'
@@ -167,6 +169,15 @@ Rails/OutputSafety:
 Rails/TimeZone:
   Enabled: false
 
+# Offense count: 8
+Rake/Desc:
+  Exclude:
+    - 'lib/tasks/auto_annotate_models.rake'
+    - 'lib/tasks/eslint.rake'
+    - 'lib/tasks/subscribe_diary_authors.rake'
+    - 'lib/tasks/subscribe_old_changesets.rake'
+    - 'lib/tasks/testing.rake'
+
 # Offense count: 558
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.