diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-06 21:57:58 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-06 21:57:58 +0300 |
| commit | e0c0ce28ea786a23d15eee95d56560079b0c6dfe (patch) | |
| tree | 29788364ad9108712307d3a051ee130a1a8c495a /spec/features/projects | |
| parent | f6e822cdbdf2d38f61926d5af6566d7f41e97361 (diff) | |
| parent | 805645510a26d11bceb75868996a76eba10ef470 (diff) | |
Merge branch '46246-gitlab-project-export-should-use-object-storage' into 'master'
Resolve "GitLab Project export should use object storage"
Closes #46246
See merge request gitlab-org/gitlab-ce!20105
Diffstat (limited to 'spec/features/projects')
| -rw-r--r-- | spec/features/projects/import_export/export_file_spec.rb | 1 | ||||
| -rw-r--r-- | spec/features/projects/import_export/namespace_export_file_spec.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/spec/features/projects/import_export/export_file_spec.rb b/spec/features/projects/import_export/export_file_spec.rb index 8a418356541..eb281cd2122 100644 --- a/spec/features/projects/import_export/export_file_spec.rb +++ b/spec/features/projects/import_export/export_file_spec.rb @@ -25,6 +25,7 @@ describe 'Import/Export - project export integration test', :js do before do allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path) + stub_feature_flags(import_export_object_storage: false) end after do diff --git a/spec/features/projects/import_export/namespace_export_file_spec.rb b/spec/features/projects/import_export/namespace_export_file_spec.rb index 7d056b0c140..9bb8a2063b5 100644 --- a/spec/features/projects/import_export/namespace_export_file_spec.rb +++ b/spec/features/projects/import_export/namespace_export_file_spec.rb @@ -5,6 +5,7 @@ describe 'Import/Export - Namespace export file cleanup', :js do before do allow(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path) + stub_feature_flags(import_export_object_storage: false) end after do |