From 1ec1bec4ee7ef7cb2e6faa7af625950f6d7aa290 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 8 Oct 2020 15:08:17 +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 12469c40b51..2f99c57f489 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -300,6 +300,14 @@ RSpec/TimecopFreeze:
     - 'ee/spec/**/*.rb'
     - 'qa/spec/**/*.rb'
 
+RSpec/TimecopTravel:
+  Enabled: false
+  AutoCorrect: true
+  Include:
+    - 'spec/**/*.rb'
+    - 'ee/spec/**/*.rb'
+    - 'qa/spec/**/*.rb'
+
 Naming/PredicateName:
   Enabled: true
   Exclude:
-- 
cgit v1.2.3