diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-08 00:27:04 +0300 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-28 22:29:37 +0300 |
| commit | bc76062774f01208403685965f4d780da4e03ebb (patch) | |
| tree | e9e21e57b8783f25475648889372f4c3aed4eb3b /app/controllers/projects/artifacts_controller.rb | |
| parent | 5a69b51bc870f5b42ee3406ba77de02f44ef8d32 (diff) | |
Merge branch 'jej/lfs-object-storage' into 'master'
Can migrate LFS objects to S3 style object storage
Closes #2841
See merge request !2760
Diffstat (limited to 'app/controllers/projects/artifacts_controller.rb')
| -rw-r--r-- | app/controllers/projects/artifacts_controller.rb | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/controllers/projects/artifacts_controller.rb b/app/controllers/projects/artifacts_controller.rb index eb010923466..a93b72a646b 100644 --- a/app/controllers/projects/artifacts_controller.rb +++ b/app/controllers/projects/artifacts_controller.rb @@ -1,6 +1,7 @@ class Projects::ArtifactsController < Projects::ApplicationController include ExtractsPath include RendersBlob + include SendFileUpload layout 'project' before_action :authorize_read_build! @@ -10,11 +11,7 @@ class Projects::ArtifactsController < Projects::ApplicationController before_action :entry, only: [:file] def download - if artifacts_file.file_storage? - send_file artifacts_file.path, disposition: 'attachment' - else - redirect_to artifacts_file.url - end + send_upload(artifacts_file, attachment: artifacts_file.filename) end def browse |