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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index cac193504b23fd2e5166998a8d07a81e50ac5cf7..5833a6e359fdc5745aa710e87ef3007ed95d9e52 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -68,7 +68,7 @@ Metrics/BlockNesting:
 # Offense count: 24
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 582
+  Max: 587
 
 # Offense count: 52
 # Configuration parameters: IgnoredMethods.
@@ -155,6 +155,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'