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>2022-11-29 00:09:36 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-11-29 00:09:36 +0300
commite5940143fe1fdb95ed7c3dc6f0a4efdfaaf876c0 (patch)
tree006afb964e1f39ccc5429d8cc91793f6cab4ddf4 /spec/requests/api
parent953180403c1798ba42d396742e0691d5772da3a5 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/requests/api')
-rw-r--r--spec/requests/api/bulk_imports_spec.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/spec/requests/api/bulk_imports_spec.rb b/spec/requests/api/bulk_imports_spec.rb
index ad57a370fc5..95279f8d468 100644
--- a/spec/requests/api/bulk_imports_spec.rb
+++ b/spec/requests/api/bulk_imports_spec.rb
@@ -50,6 +50,9 @@ RSpec.describe API::BulkImports do
.to receive(:instance_version)
.and_return(
Gitlab::VersionInfo.new(::BulkImport::MIN_MAJOR_VERSION, ::BulkImport::MIN_MINOR_VERSION_FOR_PROJECT))
+ allow(instance)
+ .to receive(:instance_enterprise)
+ .and_return(false)
end
end