summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-07-11 16:18:37 +0000
committerDouwe Maan <douwe@gitlab.com>2016-07-11 16:18:37 +0000
commit284ed39e3038392e5ca299a8ce58541a4abead99 (patch)
tree254dad49b60494154b1aa23b00edf7d005cb1eab /app/helpers
parent36c60b4c269a3d60f6b3e0df3bf1bfc7d44a6b54 (diff)
parent1bfc2ed633b2086b547727acc4aa0abaaea7731f (diff)
downloadgitlab-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/helpers')
-rw-r--r--app/helpers/workhorse_helper.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/helpers/workhorse_helper.rb b/app/helpers/workhorse_helper.rb
index 65598ad9ed3..d887cdadc34 100644
--- a/app/helpers/workhorse_helper.rb
+++ b/app/helpers/workhorse_helper.rb
@@ -28,4 +28,10 @@ module WorkhorseHelper
headers.store(*Gitlab::Workhorse.send_git_archive(repository, ref: ref, format: format))
head :ok
end
+
+ # Send an entry from artifacts through Workhorse
+ def send_artifacts_entry(build, entry)
+ headers.store(*Gitlab::Workhorse.send_artifacts_entry(build, entry))
+ head :ok
+ end
end