diff options
| author | Simon Knox <psimyn@gmail.com> | 2017-08-29 03:50:13 +0300 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-08-29 20:38:45 +0300 |
| commit | e775748671f1cec7c89e8428cf934eb386a5a1ed (patch) | |
| tree | e1f1020b3484328a4aa4d7c4b986f9c092409d01 | |
| parent | 4c7449e4d4ba9016acc6376f759856355d4fbe88 (diff) | |
resolve conflicts from 4c7449e4d4ba9016acc6376f759856355d4fbe88
| -rw-r--r-- | app/controllers/import/gitlab_projects_controller.rb | 4 | ||||
| -rw-r--r-- | spec/features/projects/import_export/import_file_spec.rb | 10 |
2 files changed, 1 insertions, 13 deletions
diff --git a/app/controllers/import/gitlab_projects_controller.rb b/app/controllers/import/gitlab_projects_controller.rb index 6784d185bad..ca36ad0003a 100644 --- a/app/controllers/import/gitlab_projects_controller.rb +++ b/app/controllers/import/gitlab_projects_controller.rb @@ -12,9 +12,6 @@ class Import::GitlabProjectsController < Import::BaseController return redirect_back_or_default(options: { alert: "You need to upload a GitLab project export archive." }) end -<<<<<<< HEAD - @project = ::Projects::GitlabProjectsImportService.new(current_user, project_params).execute -======= import_upload_path = Gitlab::ImportExport.import_upload_path(filename: tmp_filename) FileUtils.mkdir_p(File.dirname(import_upload_path)) @@ -24,7 +21,6 @@ class Import::GitlabProjectsController < Import::BaseController current_user, import_upload_path, project_params[:path]).execute ->>>>>>> 04a0f226c4... Merge branch 'race-condition-in-project-uploads-fix-9-4' into 'security-9-4' if @project.saved? redirect_to( diff --git a/spec/features/projects/import_export/import_file_spec.rb b/spec/features/projects/import_export/import_file_spec.rb index 39eb46401b8..2f23ca6bdf8 100644 --- a/spec/features/projects/import_export/import_file_spec.rb +++ b/spec/features/projects/import_export/import_file_spec.rb @@ -30,17 +30,9 @@ feature 'Import/Export - project import integration test', js: true do expect(page).to have_content('Import an exported GitLab project') expect(URI.parse(current_url).query).to eq("namespace_id=#{namespace.id}&path=test-project-path") - expect(Gitlab::ImportExport).to receive(:import_upload_path).with(filename: /\A\h{32}_test-project-path\z/).and_call_original + expect(Gitlab::ImportExport).to receive(:import_upload_path).with(filename: /\A[0-9a-f]{32}_test_project_export\.tar\.gz\z/).and_call_original -<<<<<<< HEAD attach_file('file', file) -======= - expect(page).to have_content('GitLab project export') - expect(URI.parse(current_url).query).to eq("namespace_id=#{namespace.id}&path=test-project-path") - expect(Gitlab::ImportExport).to receive(:import_upload_path).with(filename: /\A[0-9a-f]{32}_test_project_export\.tar\.gz\z/).and_call_original - - attach_file('file', file) ->>>>>>> 04a0f226c4... Merge branch 'race-condition-in-project-uploads-fix-9-4' into 'security-9-4' expect { click_on 'Import project' }.to change { Project.count }.by(1) |