From 6559f0ee67c564d62e12936e91cef6abf37ce102 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Mon, 19 Oct 2020 12:09:20 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

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

(limited to '.rubocop.yml')

diff --git a/.rubocop.yml b/.rubocop.yml
index ccc5967ebed..76e8e1b8e65 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -571,3 +571,9 @@ Gitlab/RailsLogger:
   Exclude:
     - 'spec/**/*.rb'
     - 'ee/spec/**/*.rb'
+
+# WIP See https://gitlab.com/gitlab-org/gitlab/-/issues/267606
+FactoryBot/InlineAssociation:
+  Include:
+    - 'spec/factories/**/*.rb'
+    - 'ee/spec/factories/**/*.rb'
-- 
cgit v1.2.3