From 6c15c18fa455502bf0b80316390eefde40d42a8a Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 9 Jan 2020 18:07:52 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

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

(limited to '.rubocop.yml')

diff --git a/.rubocop.yml b/.rubocop.yml
index da3707972d3..91c7aa53fb7 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -301,12 +301,6 @@ RSpec/AnyInstanceOf:
   Enabled: false
 
 # Cops for upgrade to gitlab-styles 3.1.0
-FactoryBot/FactoryClassName:
-  Enabled: false
-
-FactoryBot/CreateList:
-  Enabled: false
-
 Rails/SafeNavigationWithBlank:
   Enabled: false
 
-- 
cgit v1.2.3