Merge remote-tracking branch 'upstream/pull/2975' into master

[rails.git] / .rubocop_todo.yml

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 406a13265a699d8d1b9fd2f0ee97a2b72e6bfacc..c1060cbe2338b3c6c95a2344417a527e0c67c465 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -172,9 +172,3 @@ Style/FrozenStringLiteralComment:
 # Configuration parameters: Strict.
 Style/NumericLiterals:
   MinDigits: 11
 # Configuration parameters: Strict.
 Style/NumericLiterals:
   MinDigits: 11

-
-# Offense count: 19
-# Cop supports --auto-correct.
-Style/StringConcatenation:
-  Exclude:
-    - 'test/helpers/user_roles_helper_test.rb'