From f3b1e07903a7f509b11ad7cf188fac46d98f77f6 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 6 Apr 2020 15:10:04 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .rubocop.yml | 3 ---
 1 file changed, 3 deletions(-)

(limited to '.rubocop.yml')

diff --git a/.rubocop.yml b/.rubocop.yml
index b03aa069ebf..6dd06984de6 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -216,10 +216,8 @@ Gitlab/DuplicateSpecLocation:
   Exclude:
     - ee/spec/helpers/auth_helper_spec.rb
     - ee/spec/lib/gitlab/gl_repository_spec.rb
-    - ee/spec/models/namespace_spec.rb
     - ee/spec/services/merge_requests/refresh_service_spec.rb
     - ee/spec/helpers/ee/auth_helper_spec.rb
-    - ee/spec/models/ee/namespace_spec.rb
     - ee/spec/services/ee/merge_requests/refresh_service_spec.rb
 
 Cop/InjectEnterpriseEditionModule:
@@ -387,5 +385,4 @@ Performance/ChainArrayAllocation:
 RSpec/RepeatedExample:
   Exclude:
     - 'spec/features/merge_request/user_posts_diff_notes_spec.rb'
-    - 'spec/features/projects/files/template_type_dropdown_spec.rb'
     - 'spec/services/notification_service_spec.rb'
-- 
cgit v1.2.3