Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2024-01-05 06:19:30 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2024-01-05 06:19:30 +0300
commit77f4cd207cb3a831ffa36d67377e28030622a4a8 (patch)
treeef7c162b33706464bfaaed3f520baf2bc4525899 /spec/support
parenta95580cc56f2a94110f07c84947b1bb6c959befb (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support')
-rw-r--r--spec/support/helpers/stub_configuration.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/support/helpers/stub_configuration.rb b/spec/support/helpers/stub_configuration.rb
index f76a208fee3..e888f858a2d 100644
--- a/spec/support/helpers/stub_configuration.rb
+++ b/spec/support/helpers/stub_configuration.rb
@@ -1,5 +1,6 @@
# frozen_string_literal: true
+require 'gitlab_edition'
require 'active_support/hash_with_indifferent_access'
require 'active_support/dependencies'
@@ -198,6 +199,6 @@ module StubConfiguration
end
require_relative '../../../ee/spec/support/helpers/ee/stub_configuration' if
- Dir.exist?("#{__dir__}/../../../ee")
+ GitlabEdition.ee?
StubConfiguration.prepend_mod_with('StubConfiguration')