diff options
| author | James Lopez <james@jameslopez.es> | 2018-07-26 13:55:21 +0300 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2018-08-02 12:50:19 +0300 |
| commit | 07009a1f4893652e152794ae8160a2f46e00772c (patch) | |
| tree | a9c03b82c4b28dfa3150cbd4735c07483b9547fb /app/services/projects | |
| parent | 3cc420b8094ec0240b473205fc886bd9c728cc5d (diff) | |
Add Object Storage to GitLab project import
- Refactor uploads manager
- Refactor importer, update import spec
- Add more object storage specs
Diffstat (limited to 'app/services/projects')
| -rw-r--r-- | app/services/projects/gitlab_projects_import_service.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/services/projects/gitlab_projects_import_service.rb b/app/services/projects/gitlab_projects_import_service.rb index 615dccc4685..044afa1d5e1 100644 --- a/app/services/projects/gitlab_projects_import_service.rb +++ b/app/services/projects/gitlab_projects_import_service.rb @@ -15,7 +15,7 @@ module Projects end def execute - prepare_template_environment(template_file&.path) + prepare_template_environment(template_file) prepare_import_params @@ -61,7 +61,6 @@ module Projects if template_file params[:import_type] = 'gitlab_project' - params[:import_source] = import_upload_path end params[:import_data] = { data: data } if data.present? |