From 7e9c479f7de77702622631cff2628a9c8dcbc627 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 19 Nov 2020 08:27:35 +0000
Subject: Add latest changes from gitlab-org/gitlab@13-6-stable-ee

---
 spec/fast_spec_helper.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'spec/fast_spec_helper.rb')

diff --git a/spec/fast_spec_helper.rb b/spec/fast_spec_helper.rb
index cbab809cddb..2f0bcd318d9 100644
--- a/spec/fast_spec_helper.rb
+++ b/spec/fast_spec_helper.rb
@@ -1,5 +1,12 @@
 # frozen_string_literal: true
 
+#  $" is $LOADED_FEATURES, but RuboCop didn't like it
+if $".include?(File.expand_path('spec_helper.rb', __dir__))
+  # There's no need to load anything here if spec_helper is already loaded
+  # because spec_helper is more extensive than fast_spec_helper
+  return
+end
+
 require 'bundler/setup'
 
 ENV['GITLAB_ENV'] = 'test'
-- 
cgit v1.2.3