Fix conflicts resolution in workhorse/artifacts code

168cb81c · Grzegorz Bizon · 74c8f493 · 168cb81c
Commit 168cb81c authored Sep 08, 2017 by Grzegorz Bizon
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 8 deletions

lib/gitlab/workhorse.rb lib/gitlab/workhorse.rb +3 -8

No files found.
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -121,18 +121,13 @@ module Gitlab
        ]
      end
-      def send_artifacts_entry(build, entry)
+      def send_artifacts_entry(build, path)
        file = build.artifacts_file
-        archive =
+        archive = file.file_storage? ? file.path : file.url
-          if file.file_storage?
-            file.path
-          else
-            file.url
-          end
        params = {
          'Archive' => archive,
-          'Entry' => Base64.encode64(entry.path)
+          'Entry' => Base64.encode64(path.to_s)
        }
        [