Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-08-03 08:17:22 +0300
committerShinya Maeda <shinya@gitlab.com>2018-08-03 08:17:22 +0300
commit1f53cf7cf0cb53b5d69ab141fa9020356e62027e (patch)
treefac87bd3fcf2900116bbc2777eb6f347f50922f6 /spec/requests
parentd867081df185b873667d9eec1184ac92efc8973e (diff)
parent5f664759b57ef1c0fcfb7e95dfbff6c080a7a72f (diff)
Merge branch 'master-ce' into artifact-format-v2-with-parser
Diffstat (limited to 'spec/requests')
-rw-r--r--spec/requests/api/project_import_spec.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/requests/api/project_import_spec.rb b/spec/requests/api/project_import_spec.rb
index 55332f56508..e3fb6cecce9 100644
--- a/spec/requests/api/project_import_spec.rb
+++ b/spec/requests/api/project_import_spec.rb
@@ -7,6 +7,8 @@ describe API::ProjectImport do
let(:namespace) { create(:group) }
before do
allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path)
+ stub_feature_flags(import_export_object_storage: true)
+ stub_uploads_object_storage(FileUploader)
namespace.add_owner(user)
end