Fix new rubocop warnings

[rails.git] / .rubocop.yml

diff --git a/.rubocop.yml b/.rubocop.yml
index 62685c8ed9298696a03a7f920037b4b36ff6f02b..e99b88edc170bda2a77db1f824a8bb4ab55ee533 100644 (file)
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -3,6 +3,9 @@ inherit_from: .rubocop_todo.yml
 Rails:
   Enabled: true
 
+Performance/RedundantMerge:
+  Enabled: false
+
 Style/BracesAroundHashParameters:
   EnforcedStyle: context_dependent