From 0d6fa033121a9bef708b8f2de186c4034c61d4a3 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 6 Feb 2020 18:08:54 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .rubocop.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to '.rubocop.yml')

diff --git a/.rubocop.yml b/.rubocop.yml
index e4d16d53193..d2cca0295ee 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -334,17 +334,15 @@ RSpec/UnspecifiedException:
 # Work in progress. See https://gitlab.com/gitlab-org/gitlab/issues/196163
 RSpec/HaveGitlabHttpStatus:
   Enabled: true
+  Exclude:
+    - 'spec/support/matchers/have_gitlab_http_status.rb'
   Include:
-    - 'spec/support/shared_examples/**/*'
-    - 'ee/spec/support/shared_examples/**/*'
+    - 'spec/support/**/*'
+    - 'ee/spec/support/**/*'
     - 'spec/features/**/*'
     - 'ee/spec/features/**/*'
-    - 'spec/controllers/*.rb'
-    - 'ee/spec/controllers/*.rb'
-    - 'spec/controllers/projects/**/*.rb'
-    - 'ee/spec/controllers/projects/**/*.rb'
-    - 'spec/controllers/groups/**/*.rb'
-    - 'ee/spec/controllers/groups/**/*.rb'
+    - 'spec/controllers/**/*'
+    - 'ee/spec/controllers/**/*'
     - 'spec/requests/*.rb'
     - 'ee/spec/requests/*.rb'
 
-- 
cgit v1.2.3