diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-08-14 01:36:15 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-09-06 03:01:54 +0300 |
| commit | 262b974123d22b5d6b662b232ca4792d7998a166 (patch) | |
| tree | 223b600596a24fa4a4cd8436f8317d2874fb98ce /GITLAB_WORKHORSE_VERSION | |
| parent | 9dd34eac14a94e58999c335a175e06067f1092fa (diff) | |
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
Diffstat (limited to 'GITLAB_WORKHORSE_VERSION')
| -rw-r--r-- | GITLAB_WORKHORSE_VERSION | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION index 09b254e90c6..dfda3e0b4f0 100644 --- a/GITLAB_WORKHORSE_VERSION +++ b/GITLAB_WORKHORSE_VERSION @@ -1 +1 @@ -6.0.0 +6.1.0 |