diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-07-11 16:18:37 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-07-11 16:18:37 +0000 |
| commit | 284ed39e3038392e5ca299a8ce58541a4abead99 (patch) | |
| tree | 254dad49b60494154b1aa23b00edf7d005cb1eab /app/controllers/projects | |
| parent | 36c60b4c269a3d60f6b3e0df3bf1bfc7d44a6b54 (diff) | |
| parent | 1bfc2ed633b2086b547727acc4aa0abaaea7731f (diff) | |
| download | gitlab-ce-284ed39e3038392e5ca299a8ce58541a4abead99.tar.gz | |
Merge branch 'send-entry-via-Gitlab-Workhorse-Send-Data' into 'master'
Use Gitlab-Workhorse-Send-Data to send entry
## What does this MR do?
Use Gitlab-Workhorse-Send-Data to send entry:
Closes #19224, Closes #19128
Also requires this MR to work:
https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/53
## Are there points in the code the reviewer needs to double check?
Do we have a test for this?
## Why was this MR needed?
This way gitlab-workhorse does not have to call any API.
See merge request !5094
Diffstat (limited to 'app/controllers/projects')
| -rw-r--r-- | app/controllers/projects/artifacts_controller.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/app/controllers/projects/artifacts_controller.rb b/app/controllers/projects/artifacts_controller.rb index f11c8321464..7241949393b 100644 --- a/app/controllers/projects/artifacts_controller.rb +++ b/app/controllers/projects/artifacts_controller.rb @@ -23,10 +23,9 @@ class Projects::ArtifactsController < Projects::ApplicationController entry = build.artifacts_metadata_entry(params[:path]) if entry.exists? - render json: { archive: build.artifacts_file.path, - entry: Base64.encode64(entry.path) } + send_artifacts_entry(build, entry) else - render json: {}, status: 404 + render_404 end end |