summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-09-08 14:04:44 +0200
committerRémy Coutable <remy@rymai.me>2017-09-08 14:04:44 +0200
commit572e90125f56e70cc6220f5ad45c6fc1cc0c339e (patch)
treee8db8151382595587b27fee4490e82006b08c4c6
parent39a93e0bb7ff2178a309c9fe8a544d2a10d3a517 (diff)
downloadgitlab-ce-rc/backport-workhorse-send_artifacts_entry-signature-from-ee.tar.gz
Backport the EE signature of Gitlab::Workhorse#send_artifacts_entryrc/backport-workhorse-send_artifacts_entry-signature-from-ee
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--lib/gitlab/workhorse.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index 7a94af2f8f1..17550cf9074 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -121,10 +121,10 @@ module Gitlab
]
end
- def send_artifacts_entry(build, path)
+ def send_artifacts_entry(build, entry)
params = {
'Archive' => build.artifacts_file.path,
- 'Entry' => Base64.encode64(path.to_s)
+ 'Entry' => Base64.encode64(entry.to_s)
}
[