X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5d3ecffa28510c867665001a7615559a185869c6..4e95ff17078f54866a85a3702948506bfd67acf8:/.rubocop.yml?ds=sidebyside

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'