Commit graph

9 commits

Author SHA1 Message Date
GitLab Bot
8c4e384860 Add latest changes from gitlab-org/gitlab@master 2021-09-23 12:11:29 +00:00
GitLab Bot
298ae510ce Add latest changes from gitlab-org/gitlab@master 2021-01-14 06:11:16 +00:00
GitLab Bot
dec7332357 Add latest changes from gitlab-org/gitlab@master 2021-01-07 18:10:38 +00:00
GitLab Bot
adf76f8f1d Add latest changes from gitlab-org/gitlab@master 2020-09-04 15:08:46 +00:00
GitLab Bot
fb10c412ec Add latest changes from gitlab-org/gitlab@master 2020-08-20 06:10:17 +00:00
GitLab Bot
88ad172d04 Add latest changes from gitlab-org/gitlab@master 2020-08-05 09:10:01 +00:00
Stan Hu
e2179093b0 Bump CarrierWave to 1.3.0 and remove monkey patches
Full list of changes:
https://github.com/carrierwaveuploader/carrierwave/blob/master/CHANGELOG.md
2018-12-24 09:24:12 -08:00
Stan Hu
79a091b12a Fix object storage not working properly with Google S3 compatibility
Even in AWS S3 compatibility mode, Google now appears to reject requests
that includes this header with this error:

```
Requests cannot specify both x-amz and x-goog headers
```

This has been submitted upstream via
https://github.com/carrierwaveuploader/carrierwave/pull/2356.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53846.
2018-12-17 11:58:16 -08:00
Stan Hu
262b974123 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
(ef80978ff8/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
2018-09-05 17:01:54 -07:00