From: Tom Hughes <tom@compton.nu>
Date: Thu, 11 Feb 2016 07:12:41 +0000 (+0000)
Subject: Update rubocopy config after bug fixes
X-Git-Tag: live~4507
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/8008dc9ccb1ca351a9e6c32606683b349a69e77b

Update rubocopy config after bug fixes
---

diff --git a/.rubocop.yml b/.rubocop.yml
index e99b88edc..f12f24a9f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -3,9 +3,6 @@ inherit_from: .rubocop_todo.yml
 Rails:
   Enabled: true
 
-Performance/RedundantMerge:
-  Enabled: false
-
 Style/BracesAroundHashParameters:
   EnforcedStyle: context_dependent
 
@@ -36,7 +33,3 @@ Style/HashSyntax:
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes
-
-Style/WordArray:
-  Exclude:
-    - 'test/models/message_test.rb'