diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-10 21:09:15 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-10 21:09:15 +0300 |
| commit | f6905d2ed293ccde386ba2798e7a623c228e8f51 (patch) | |
| tree | 83e7defc9e9ec94462c3bc3d86e4ca0cbc4b7c21 /spec/support/import_export | |
| parent | f2f748c08166ef350aa4183242c3611f6617f651 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support/import_export')
| -rw-r--r-- | spec/support/import_export/common_util.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/support/import_export/common_util.rb b/spec/support/import_export/common_util.rb index 0069ae81b76..c0c3559cca0 100644 --- a/spec/support/import_export/common_util.rb +++ b/spec/support/import_export/common_util.rb @@ -19,7 +19,7 @@ module ImportExport end 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::NdjsonReader).to receive(:exist?).and_return(true) else |