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 /app/controllers | |
| 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 'app/controllers')
| -rw-r--r-- | app/controllers/projects_controller.rb | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 0eaf9f94e37..646d8329aff 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -191,10 +191,8 @@ class ProjectsController < Projects::ApplicationController end def download_export - if export_project_object_storage? + if @project.export_project_object_exists? send_upload(@project.import_export_upload.export_file) - elsif export_project_path - send_file export_project_path, disposition: 'attachment' else redirect_to( edit_project_path(@project, anchor: 'js-export-project'), @@ -425,12 +423,4 @@ class ProjectsController < Projects::ApplicationController def whitelist_query_limiting Gitlab::QueryLimiting.whitelist('https://gitlab.com/gitlab-org/gitlab-ce/issues/42440') end - - def export_project_path - @export_project_path ||= @project.export_project_path - end - - def export_project_object_storage? - @project.export_project_object_exists? - end end |