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

Merge branch 'rc/backport-workhorse-send_artifacts_entry-signature-from-ee' into 'master'
f9b30c6d · Kamil Trzciński · 7baa7749 · 572e9012 · f9b30c6d
Commit f9b30c6d authored Sep 11, 2017 by Kamil Trzciński
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

workhorse.rb lib/gitlab/workhorse.rb +2 -2

No files found.
--- 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)
        }

        [