From 262b974123d22b5d6b662b232ca4792d7998a166 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Mon, 13 Aug 2018 15:36:15 -0700 Subject: Fix attachments not displaying inline with Google Cloud Storage There were several issues: 1. With Google Cloud Storage, we can't override the Content-Type with Response-Content-Type once it is set. Setting the value to `application/octet-stream` doesn't buy us anything. GCS defaults to `application/octet-stream`, and AWS uses `binary/octet-stream`. Just remove this `Content-Type` when we upload new files. 2. CarrierWave and fog-google need to support query parameters: https://github.com/fog/fog-google/pull/409/files, https://github.com/carrierwaveuploader/carrierwave/pull/2332/files. CarrierWave has been monkey-patched until an official release. 3. Workhorse also needs to remove the Content-Type header in the request (https://gitlab.com/gitlab-org/gitlab-workhorse/blob/ef80978ff89e628c8eeb66556720e30587d3deb6/internal/objectstore/object.go#L66), or we'll get a 403 error when uploading due to signed URLs not matching the headers. Upgrading to Workhorse 6.1.0 for https://gitlab.com/gitlab-org/gitlab-workhorse/merge_requests/297 will make Workhorse use the headers that are used by Rails. Closes #49957 --- lib/object_storage/direct_upload.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/object_storage') diff --git a/lib/object_storage/direct_upload.rb b/lib/object_storage/direct_upload.rb index b372b4af090..ab43910c8bd 100644 --- a/lib/object_storage/direct_upload.rb +++ b/lib/object_storage/direct_upload.rb @@ -158,7 +158,7 @@ module ObjectStorage end def upload_options - { 'Content-Type' => 'application/octet-stream' } + {} end def connection -- cgit v1.2.1