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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index a40f0f4f726524d7e89c6358d5dc12f355afcc0b..32514771cffbe6ad4ffa692b8032df38d8bc4cc2 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -111,13 +111,11 @@ Naming/InclusiveLanguage:
     - 'app/helpers/browse_tags_helper.rb'
     - 'app/views/api/capabilities/show.builder'
     - 'app/views/confirmations/_resend_success_flash.html.erb'
-    - 'app/views/users/blocked.html.erb'
     - 'app/views/users/suspended.html.erb'
     - 'config/environments/production.rb'
     - 'config/initializers/canonical_rails.rb'
     - 'config/initializers/config.rb'
     - 'config/initializers/doorkeeper.rb'
-    - 'test/integration/user_login_test.rb'
 
 # Offense count: 8
 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.