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

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 0cdd004a0834e24d826760f31acbd68dd2c959e0..779b3a8fa29a8c52332618b9a8b9be81d27aee08 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -183,13 +183,6 @@ Rails/OutputSafety:
     - 'lib/rich_text.rb'
     - 'test/helpers/application_helper_test.rb'
 
-# Offense count: 90
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: strict, flexible
-Rails/TimeZone:
-  Enabled: false
-
 # Offense count: 6
 # Cop supports --auto-correct.
 Rake/Desc: