Commit f3544bb1 authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'legacy-group-import-export-config' into 'master'

Rename group import/export config to legacy

See merge request gitlab-org/gitlab!29910
parents 6d8264b8 dfd5b506
......@@ -88,8 +88,8 @@ module Gitlab
'group.json'
end
def group_config_file
Rails.root.join('lib/gitlab/import_export/group/import_export.yml')
def legacy_group_config_file
Rails.root.join('lib/gitlab/import_export/group/legacy_import_export.yml')
end
end
end
......
......@@ -122,7 +122,7 @@ module Gitlab
@reader ||= Gitlab::ImportExport::Reader.new(
shared: @shared,
config: Gitlab::ImportExport::Config.new(
config: Gitlab::ImportExport.group_config_file
config: Gitlab::ImportExport.legacy_group_config_file
).to_h
)
end
......
......@@ -43,7 +43,7 @@ module Gitlab
@reader ||= Gitlab::ImportExport::Reader.new(
shared: @shared,
config: Gitlab::ImportExport::Config.new(
config: Gitlab::ImportExport.group_config_file
config: Gitlab::ImportExport.legacy_group_config_file
).to_h
)
end
......
......@@ -156,7 +156,7 @@ describe Gitlab::ImportExport::RelationTreeRestorer do
let(:reader) do
Gitlab::ImportExport::Reader.new(
shared: shared,
config: Gitlab::ImportExport::Config.new(config: Gitlab::ImportExport.group_config_file).to_h
config: Gitlab::ImportExport::Config.new(config: Gitlab::ImportExport.legacy_group_config_file).to_h
)
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment