diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-09-11 14:26:52 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-09-11 14:26:52 +0000 |
| commit | f9b30c6d7ea0aa0ed60a7fdf94273b4b3c24f6fc (patch) | |
| tree | a417392b0e7649fd6b1377e051e4f3a085ba16cf | |
| parent | 7baa77494f34e326f0b920336fd48fb5d17ccd47 (diff) | |
| parent | 572e90125f56e70cc6220f5ad45c6fc1cc0c339e (diff) | |
| download | gitlab-ce-f9b30c6d7ea0aa0ed60a7fdf94273b4b3c24f6fc.tar.gz | |
Merge branch 'rc/backport-workhorse-send_artifacts_entry-signature-from-ee' into 'master'
Backport the EE signature of Gitlab::Workhorse#send_artifacts_entry
See merge request !14144
| -rw-r--r-- | lib/gitlab/workhorse.rb | 4 |
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) } [ |