summaryrefslogtreecommitdiff
path: root/lib/api/project_export.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-15 06:10:17 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-15 06:10:17 +0000
commitd35de87f96f580fede92e6b43352fbff8316e2c3 (patch)
tree9b0ebb12a3ce148f35f1e05a3dba2675adc97f99 /lib/api/project_export.rb
parent03c5d7f2c175acedafcb1b233ec1e40e9fcc8d1b (diff)
downloadgitlab-ce-d35de87f96f580fede92e6b43352fbff8316e2c3.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/project_export.rb')
-rw-r--r--lib/api/project_export.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/api/project_export.rb b/lib/api/project_export.rb
index 76b3dea723a..4041e130f9e 100644
--- a/lib/api/project_export.rb
+++ b/lib/api/project_export.rb
@@ -30,7 +30,11 @@ module API
check_rate_limit! :project_download_export, [current_user, user_project]
if user_project.export_file_exists?
- present_carrierwave_file!(user_project.export_file)
+ if user_project.export_archive_exists?
+ present_carrierwave_file!(user_project.export_file)
+ else
+ render_api_error!('The project export file is not available yet', 404)
+ end
else
render_api_error!('404 Not found or has expired', 404)
end