summaryrefslogtreecommitdiff
path: root/.rubocop_todo.yml
diff options
context:
space:
mode:
Diffstat (limited to '.rubocop_todo.yml')
-rw-r--r--.rubocop_todo.yml6
1 files changed, 0 insertions, 6 deletions
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: