Merge branch 'sh-fix-multipart-upload-signed-urls' into 'master'

Fix object storage uploads not working with AWS v2

Closes gitlab-workhorse#181

See merge request gitlab-org/gitlab-ce!21731

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/object_storage/direct_upload.rb b/lib/object_storage/direct_upload.rb
index ab43910c8bd..97f56e10ccf 100644
--- a/lib/object_storage/direct_upload.rb
+++ b/lib/object_storage/direct_upload.rb
@@ -89,7 +89,7 @@ module ObjectStorage
         method: 'PUT',
         bucket_name: bucket_name,
         object_name: object_name,
-        query: { uploadId: upload_id, partNumber: part_number },
+        query: { 'uploadId' => upload_id, 'partNumber' => part_number },
         headers: upload_options
       }, expire_at)
     end
@@ -100,7 +100,7 @@ module ObjectStorage
         method: 'POST',
         bucket_name: bucket_name,
         object_name: object_name,
-        query: { uploadId: upload_id },
+        query: { 'uploadId' => upload_id },
         headers: { 'Content-Type' => 'application/xml' }
       }, expire_at)
     end
@@ -111,7 +111,7 @@ module ObjectStorage
         method: 'DELETE',
         bucket_name: bucket_name,
         object_name: object_name,
-        query: { uploadId: upload_id }
+        query: { 'uploadId' => upload_id }
       }, expire_at)
     end