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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 5833a6e359fdc5745aa710e87ef3007ed95d9e52..a0b57f586badc5006e2b9ba7f7f52395a526b374 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.
@@ -141,6 +142,10 @@ Rails/HelperInstanceVariable:
   Exclude:
     - 'app/helpers/title_helper.rb'
 
+Rails/LexicallyScopedActionFilter:
+  Exclude:
+    - 'app/controllers/oauth2_applications_controller.rb'
+
 # Offense count: 5
 # Configuration parameters: Include.
 # Include: db/migrate/*.rb
@@ -168,6 +173,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.