Add latest changes from gitlab-org/gitlab@master
This commit is contained in:
parent
1acb6e46fe
commit
424ed404d6
|
@ -1,8 +0,0 @@
|
|||
---
|
||||
name: import_relation_object_persistence
|
||||
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79963
|
||||
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/354497
|
||||
milestone: '14.9'
|
||||
type: development
|
||||
group: group::import
|
||||
default_enabled: false
|
|
@ -89,7 +89,7 @@ module Gitlab
|
|||
end
|
||||
|
||||
def save_relation_object(relation_object, relation_key, relation_definition, relation_index)
|
||||
if Feature.enabled?(:import_relation_object_persistence) && relation_object.new_record?
|
||||
if relation_object.new_record?
|
||||
Gitlab::ImportExport::Base::RelationObjectSaver.new(
|
||||
relation_object: relation_object,
|
||||
relation_key: relation_key,
|
||||
|
|
|
@ -204,19 +204,5 @@ RSpec.describe Gitlab::ImportExport::Group::TreeRestorer do
|
|||
end
|
||||
end
|
||||
|
||||
context 'when import_relation_object_persistence feature flag is enabled' do
|
||||
before do
|
||||
stub_feature_flags(import_relation_object_persistence: true)
|
||||
end
|
||||
|
||||
include_examples 'group restoration'
|
||||
end
|
||||
|
||||
context 'when import_relation_object_persistence feature flag is disabled' do
|
||||
before do
|
||||
stub_feature_flags(import_relation_object_persistence: false)
|
||||
end
|
||||
|
||||
include_examples 'group restoration'
|
||||
end
|
||||
include_examples 'group restoration'
|
||||
end
|
||||
|
|
|
@ -1085,35 +1085,13 @@ RSpec.describe Gitlab::ImportExport::Project::TreeRestorer do
|
|||
end
|
||||
end
|
||||
|
||||
context 'when import_relation_object_persistence feature flag is enabled' do
|
||||
before do
|
||||
stub_feature_flags(import_relation_object_persistence: true)
|
||||
end
|
||||
context 'enable ndjson import' do
|
||||
it_behaves_like 'project tree restorer work properly', :legacy_reader, true
|
||||
|
||||
context 'enable ndjson import' do
|
||||
it_behaves_like 'project tree restorer work properly', :legacy_reader, true
|
||||
|
||||
it_behaves_like 'project tree restorer work properly', :ndjson_reader, true
|
||||
end
|
||||
|
||||
context 'disable ndjson import' do
|
||||
it_behaves_like 'project tree restorer work properly', :legacy_reader, false
|
||||
end
|
||||
it_behaves_like 'project tree restorer work properly', :ndjson_reader, true
|
||||
end
|
||||
|
||||
context 'when import_relation_object_persistence feature flag is disabled' do
|
||||
before do
|
||||
stub_feature_flags(import_relation_object_persistence: false)
|
||||
end
|
||||
|
||||
context 'enable ndjson import' do
|
||||
it_behaves_like 'project tree restorer work properly', :legacy_reader, true
|
||||
|
||||
it_behaves_like 'project tree restorer work properly', :ndjson_reader, true
|
||||
end
|
||||
|
||||
context 'disable ndjson import' do
|
||||
it_behaves_like 'project tree restorer work properly', :legacy_reader, false
|
||||
end
|
||||
context 'disable ndjson import' do
|
||||
it_behaves_like 'project tree restorer work properly', :legacy_reader, false
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue