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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index f49440e81159d59165f8366b8a8d03a37ef4056f..a0b57f586badc5006e2b9ba7f7f52395a526b374 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -19,7 +19,7 @@ require:
 # Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Layout/LineLength:
-  Max: 254
+  Max: 270
 
 # Offense count: 36
 # Configuration parameters: AllowSafeAssignment.
@@ -142,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
@@ -178,11 +182,6 @@ Rake/Desc:
     - 'lib/tasks/subscribe_old_changesets.rake'
     - 'lib/tasks/testing.rake'
 
-# Offense count: 3
-Rake/MethodDefinitionInTask:
-  Exclude:
-    - 'lib/tasks/eslint.rake'
-
 # Offense count: 558
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.