Commit a26d0984 authored by Oswaldo Ferreira's avatar Oswaldo Ferreira

Merge branch 'proper-default-enabled-for-project-import-ndjson' into 'master'

Align usage of project_import_ndjson

See merge request gitlab-org/gitlab!34271
parents 0d9f0596 6e54c143
...@@ -19,7 +19,7 @@ module ImportExport ...@@ -19,7 +19,7 @@ module ImportExport
end end
def setup_reader(reader) def setup_reader(reader)
if reader == :ndjson_reader && Feature.enabled?(:project_import_ndjson) if reader == :ndjson_reader && Feature.enabled?(:project_import_ndjson, default_enabled: true)
allow_any_instance_of(Gitlab::ImportExport::JSON::LegacyReader::File).to receive(:exist?).and_return(false) allow_any_instance_of(Gitlab::ImportExport::JSON::LegacyReader::File).to receive(:exist?).and_return(false)
allow_any_instance_of(Gitlab::ImportExport::JSON::NdjsonReader).to receive(:exist?).and_return(true) allow_any_instance_of(Gitlab::ImportExport::JSON::NdjsonReader).to receive(:exist?).and_return(true)
else else
......
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