From 030baf70d25a666b660b0024f000586631ee3daf Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Tue, 21 Feb 2017 17:50:22 -0600
Subject: Enable Performance/RedundantMerge

---
 .rubocop_todo.yml | 6 ------
 1 file changed, 6 deletions(-)

(limited to '.rubocop_todo.yml')

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 29453cb4981..ca80e9c3f20 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -51,12 +51,6 @@ Performance/RedundantMatch:
     - 'lib/gitlab/diff/highlight.rb'
     - 'lib/gitlab/diff/parser.rb'
 
-# Offense count: 25
-# Cop supports --auto-correct.
-# Configuration parameters: MaxKeyValuePairs.
-Performance/RedundantMerge:
-  Enabled: false
-
 # Offense count: 15
 # Configuration parameters: CustomIncludeMethods.
 RSpec/EmptyExampleGroup:
-- 
cgit v1.2.1