From 2ee5991b42717969af93cb30d863aafab04dff8a Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 20 Jan 2020 09:08:32 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .rubocop.yml | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

(limited to '.rubocop.yml')

diff --git a/.rubocop.yml b/.rubocop.yml
index da14413deb7..b374012cac5 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -301,24 +301,6 @@ RSpec/AnyInstanceOf:
   Enabled: false
 
 # Cops for upgrade to gitlab-styles 3.1.0
-Rails/SafeNavigationWithBlank:
-  Enabled: false
-
-Rails/ApplicationController:
-  Enabled: false
-
-Rails/ApplicationMailer:
-  Enabled: false
-
-Rails/RakeEnvironment:
-  Enabled: false
-
-Rails/HelperInstanceVariable:
-  Enabled: false
-
-Rails/EnumHash:
-  Enabled: false
-
 RSpec/ReceiveCounts:
   Enabled: false
 
@@ -362,10 +344,13 @@ RSpec/UnspecifiedException:
   Enabled: false
 
 RSpec/HaveGitlabHttpStatus:
-  Enabled: false
+  Enabled: true
+  Include:
+    - 'spec/support/shared_examples/**/*'
 
 Style/MultilineWhenThen:
   Enabled: false
 
 Style/FloatDivision:
   Enabled: false
+  
\ No newline at end of file
-- 
cgit v1.2.3