diff options
| author | James Lopez <james@jameslopez.es> | 2018-08-29 15:41:56 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2018-09-06 16:52:42 +0200 |
| commit | a2aa505805478540b3150b2f9093c8658e18597d (patch) | |
| tree | 7f080afe99e546f743e14c8efa5c6a30c2527554 /lib/api/project_export.rb | |
| parent | a2ea32dd44cc4a104e404325c73a77151913a946 (diff) | |
| download | gitlab-ce-a2aa505805478540b3150b2f9093c8658e18597d.tar.gz | |
Refactor code to remove object storage flag from Import/Export
Updated docs, refactor import/export code
Fix AvatarUploader path issue
Fix project export upload webhook error
Diffstat (limited to 'lib/api/project_export.rb')
| -rw-r--r-- | lib/api/project_export.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/api/project_export.rb b/lib/api/project_export.rb index 15c57a2fc02..8954a0c0a4c 100644 --- a/lib/api/project_export.rb +++ b/lib/api/project_export.rb @@ -21,11 +21,7 @@ module API detail 'This feature was introduced in GitLab 10.6.' end get ':id/export/download' do - path = user_project.export_project_path - - if path - present_disk_file!(path, File.basename(path), 'application/gzip') - elsif user_project.export_project_object_exists? + if user_project.export_project_object_exists? present_carrierwave_file!(user_project.import_export_upload.export_file) else render_api_error!('404 Not found or has expired', 404) |