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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index d1f897bacc3016fb125d03dd982b0eefd413f575..8c0827ab7d357f1bc2548d8200f27b2cc47a741a 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -130,12 +130,6 @@ Naming/PredicateName:
     - 'app/models/user.rb'
     - 'lib/classic_pagination/pagination.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-Performance/StringIdentifierArgument:
-  Exclude:
-    - 'test/controllers/accounts_controller_test.rb'
-
 # Offense count: 5
 # Configuration parameters: Database, Include.
 # SupportedDatabases: mysql, postgresql
@@ -167,6 +161,7 @@ Rails/HelperInstanceVariable:
 Rails/LexicallyScopedActionFilter:
   Exclude:
     - 'app/controllers/oauth2_applications_controller.rb'
+    - 'app/controllers/oauth2_authorizations_controller.rb'
 
 # Offense count: 5
 # Configuration parameters: Include.