Fix tests that made assumptions about tag ordering

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index e99b88edc170bda2a77db1f824a8bb4ab55ee533..f12f24a9f4c0b4a6215032efadfed4a27845042d 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -3,9 +3,6 @@ inherit_from: .rubocop_todo.yml
 Rails:
   Enabled: true
 
 Rails:
   Enabled: true
 

-Performance/RedundantMerge:
-  Enabled: false
-

 Style/BracesAroundHashParameters:
   EnforcedStyle: context_dependent
 
 Style/BracesAroundHashParameters:
   EnforcedStyle: context_dependent
 


@@ -36,7 +33,3 @@ Style/HashSyntax:
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes

-
-Style/WordArray:
-  Exclude:
-    - 'test/models/message_test.rb'