diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-16 17:34:23 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-16 17:34:23 +0000 |
| commit | 71ba3982636d19b6c8208180ff5626a405cc23fc (patch) | |
| tree | 3f3d60fd5224c0c2f3a0351c5a74c9a208e50e02 /lib/api | |
| parent | 5d58949ea6ff3fb3ccb908518a0aef1f5bf6693e (diff) | |
| parent | d8dfec0ffa4fdbb383bf4f0d1ef71969adb50dd3 (diff) | |
| download | gitlab-ce-71ba3982636d19b6c8208180ff5626a405cc23fc.tar.gz | |
Merge branch '43345-spec-requests-api-project_import_spec-rb-fails' into 'master'
Resolve "spec/requests/api/project_import_spec.rb fails"
Closes #43345
See merge request gitlab-org/gitlab-ce!17184
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/project_import.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/api/project_import.rb b/lib/api/project_import.rb index c32e2f26ae3..a509c1f32c1 100644 --- a/lib/api/project_import.rb +++ b/lib/api/project_import.rb @@ -41,8 +41,12 @@ module API current_user.namespace end - project_params = import_params.merge(namespace_id: namespace.id, - file: import_params[:file]['tempfile']) + project_params = { + path: import_params[:path], + namespace_id: namespace.id, + file: import_params[:file]['tempfile'] + } + project = ::Projects::GitlabProjectsImportService.new(current_user, project_params).execute render_api_error!(project.errors.full_messages&.first, 400) unless project.saved? |