Skip to content
代码片段 群组 项目
提交 199902dc 编辑于 作者: Bojan Marjanovic's avatar Bojan Marjanovic 提交者: Stan Hu
浏览文件

Remove FF bulk_imports_batched_import_export

This feature flag was introduced in 16.2 and is now being removed.

Changelog: other
上级 d9019f70
No related branches found
No related tags found
无相关合并请求
......@@ -144,9 +144,9 @@ def export_relations_url_path_base
File.join(base_resource_path, 'export_relations')
end
def export_relations_url_path(batched: false)
if batched && bulk_import.supports_batched_export?
Gitlab::Utils.add_url_parameters(export_relations_url_path_base, batched: batched)
def export_relations_url_path
if bulk_import.supports_batched_export?
Gitlab::Utils.add_url_parameters(export_relations_url_path_base, batched: true)
else
export_relations_url_path_base
end
......
......@@ -125,7 +125,7 @@ def log_and_fail(exception)
end
def export_url
entity.export_relations_url_path(batched: Feature.enabled?(:bulk_imports_batched_import_export))
entity.export_relations_url_path
end
end
end
---
name: bulk_imports_batched_import_export
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/124434
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/406559
milestone: '16.2'
type: development
group: group::import and integrate
default_enabled: false
......@@ -271,7 +271,7 @@
import = build(:bulk_import, source_version: '16.2.0')
entity = build(:bulk_import_entity, :project_entity, bulk_import: import)
expect(entity.export_relations_url_path(batched: true))
expect(entity.export_relations_url_path)
.to eq("/projects/#{entity.source_xid}/export_relations?batched=true")
end
end
......@@ -280,7 +280,7 @@
it 'returns export relations url' do
entity = build(:bulk_import_entity)
expect(entity.export_relations_url_path(batched: true))
expect(entity.export_relations_url_path)
.to eq("/groups/#{entity.source_xid}/export_relations")
end
end
......
......@@ -127,20 +127,6 @@
described_class.new.perform(entity.id)
end
context 'when bulk_imports_batched_import_export feature flag is disabled' do
it 'requests relation export without batched param' do
stub_feature_flags(bulk_imports_batched_import_export: false)
expected_url = "/projects/#{entity.source_xid}/export_relations"
expect_next_instance_of(BulkImports::Clients::HTTP) do |client|
expect(client).to receive(:post).with(expected_url)
end
described_class.new.perform(entity.id)
end
end
end
end
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册