From a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 16 Jun 2021 18:25:58 +0000
Subject: Add latest changes from gitlab-org/gitlab@14-0-stable-ee

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

(limited to '.rubocop_todo.yml')

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 26b12f26943..ad1f7afa451 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -152,7 +152,7 @@ Lint/MissingCopEnableDirective:
 Lint/MixedRegexpCaptureTypes:
   Exclude:
     - 'app/models/alert_management/alert.rb'
-    - 'app/models/project_services/ewm_service.rb'
+    - 'app/models/integrations/ewm.rb'
     - 'app/uploaders/file_uploader.rb'
     - 'ee/lib/gitlab/code_owners/reference_extractor.rb'
     - 'lib/gitlab/ci/pipeline/expression/lexeme/string.rb'
@@ -742,11 +742,6 @@ Style/ExplicitBlockArgument:
 Style/FormatString:
   Enabled: false
 
-# Offense count: 67
-# Cop supports --auto-correct.
-Style/GlobalStdStream:
-  Enabled: false
-
 # Offense count: 897
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
-- 
cgit v1.2.3