From 6e734c809b18a0470d81c78e1ecd9b3f8278de89 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 8 Jan 2021 15:10:26 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

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

(limited to '.rubocop.yml')

diff --git a/.rubocop.yml b/.rubocop.yml
index 1ae4ac47bca..4a0cd9579e6 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -326,6 +326,14 @@ RSpec/TimecopTravel:
     - 'ee/spec/**/*.rb'
     - 'qa/spec/**/*.rb'
 
+RSpec/WebMockEnable:
+  Enabled: true
+  Include:
+    - 'spec/**/*.rb'
+    - 'ee/spec/**/*.rb'
+  Exclude:
+    - 'spec/support/webmock.rb'
+
 Naming/PredicateName:
   Enabled: true
   Exclude:
-- 
cgit v1.2.3