summaryrefslogtreecommitdiff
path: root/.rubocop.yml
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-21 17:50:22 -0600
committerDouwe Maan <douwe@selenight.nl>2017-02-23 09:31:57 -0600
commit030baf70d25a666b660b0024f000586631ee3daf (patch)
tree20dbdbb674e9a4fd0ad6d82161e34fd26aaf37cd /.rubocop.yml
parentc5a49cc3c56283ae5f015c808327b1a29ca09ed9 (diff)
downloadgitlab-ce-030baf70d25a666b660b0024f000586631ee3daf.tar.gz
Enable Performance/RedundantMerge
Diffstat (limited to '.rubocop.yml')
-rw-r--r--.rubocop.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index 88264d046ae..4c6438f8b0d 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -889,6 +889,10 @@ Lint/Loop:
Metrics/BlockLength:
Enabled: false
+Performance/RedundantMerge:
+ Enabled: true
+ MaxKeyValuePairs: 1
+
RSpec/LetSetup:
Enabled: false