From a1d73247427b451ff85ccaa6b93dccf10e04283a Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 26 Aug 2020 00:10:31 +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 a00ca6199c2..3fce90ee723 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -282,6 +282,14 @@ Cop/ActiveRecordAssociationReload:
 Gitlab/AvoidFeatureGet:
   Enabled: true
 
+RSpec/TimecopFreeze:
+  Enabled: false
+  AutoCorrect: true
+  Include:
+    - 'spec/**/*.rb'
+    - 'ee/spec/**/*.rb'
+    - 'qa/spec/**/*.rb'
+
 Naming/PredicateName:
   Enabled: true
   Exclude:
-- 
cgit v1.2.3