diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-08-13 15:36:15 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-09-05 17:01:54 -0700 |
| commit | 262b974123d22b5d6b662b232ca4792d7998a166 (patch) | |
| tree | 223b600596a24fa4a4cd8436f8317d2874fb98ce /Gemfile | |
| parent | 9dd34eac14a94e58999c335a175e06067f1092fa (diff) | |
| download | gitlab-ce-262b974123d22b5d6b662b232ca4792d7998a166.tar.gz | |
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 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -107,7 +107,9 @@ gem 'kaminari', '~> 1.0' gem 'hamlit', '~> 2.8.8' # Files attachments -gem 'carrierwave', '~> 1.2' +# Locked until https://github.com/carrierwaveuploader/carrierwave/pull/2332/files is merged. +# config/initializers/carrierwave_patch.rb can be removed once that change is released. +gem 'carrierwave', '= 1.2.3' gem 'mini_magick' # Drag and Drop UI |