From bd860c22f6a4b9473cbddd34a53eead8235a7ea1 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 17 Sep 2019 12:06:48 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

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

(limited to '.rubocop_todo.yml')

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index f1f8ff6e862..48b840b4af2 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -565,11 +565,6 @@ Style/EmptyLiteral:
 Style/EmptyMethod:
   Enabled: false
 
-# Offense count: 40
-# Cop supports --auto-correct.
-Style/Encoding:
-  Enabled: false
-
 # Offense count: 203
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle.
-- 
cgit v1.2.3