From 22e9af3c8b8aedf7f46b786be968862b74a2d07e Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 27 Jan 2020 12:08:35 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .rubocop.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to '.rubocop.yml')

diff --git a/.rubocop.yml b/.rubocop.yml
index ae6f633fd60..860d57d89a0 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -301,12 +301,6 @@ RSpec/AnyInstanceOf:
   Enabled: false
 
 # Cops for upgrade to gitlab-styles 3.1.0
-RSpec/ReceiveCounts:
-  Enabled: false
-
-RSpec/ContextMethod:
-  Enabled: false
-
 RSpec/ImplicitSubject:
   Enabled: false
 
@@ -343,6 +337,7 @@ RSpec/MissingExampleGroupArgument:
 RSpec/UnspecifiedException:
   Enabled: false
 
+# Work in progress. See https://gitlab.com/gitlab-org/gitlab/issues/196163
 RSpec/HaveGitlabHttpStatus:
   Enabled: true
   Include:
@@ -350,6 +345,8 @@ RSpec/HaveGitlabHttpStatus:
     - 'ee/spec/support/shared_examples/**/*'
     - 'spec/features/**/*'
     - 'ee/spec/features/**/*'
+    - 'spec/controllers/*.rb'
+    - 'ee/spec/controllers/*.rb'
 
 Style/MultilineWhenThen:
   Enabled: false
-- 
cgit v1.2.3