diff options
author | James Lopez <james@jameslopez.es> | 2016-08-02 12:32:28 +0300 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-08-04 13:51:55 +0300 |
commit | 6a0bbb5aa58e37a0ad8c3817c4e809143adce1be (patch) | |
tree | 7ea74aad1858746674f1fa345cc5f40d32117b78 /app/controllers/import | |
parent | 632113e43cc3296759b11dc20b1b7f2f056278f0 (diff) |
using shared path for project import uploads and refactored gitlab remove export worker
Diffstat (limited to 'app/controllers/import')
-rw-r--r-- | app/controllers/import/gitlab_projects_controller.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/controllers/import/gitlab_projects_controller.rb b/app/controllers/import/gitlab_projects_controller.rb index 30df1fb2fec..3ec173abcdb 100644 --- a/app/controllers/import/gitlab_projects_controller.rb +++ b/app/controllers/import/gitlab_projects_controller.rb @@ -12,13 +12,14 @@ class Import::GitlabProjectsController < Import::BaseController return redirect_back_or_default(options: { alert: "You need to upload a GitLab project export archive." }) end - imported_file = project_params[:file].path + "-import" + import_upload_path = Gitlab::ImportExport.import_upload_path(filename: project_params[:file].original_filename) - FileUtils.copy_entry(project_params[:file].path, imported_file) + FileUtils.mkdir_p(File.dirname(import_upload_path)) + FileUtils.copy_entry(project_params[:file].path, import_upload_path) @project = Gitlab::ImportExport::ProjectCreator.new(project_params[:namespace_id], current_user, - File.expand_path(imported_file), + import_upload_path, project_params[:path]).execute if @project.saved? |