diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-12-16 16:24:17 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-12-17 11:58:16 -0800 |
| commit | 79a091b12aab9c41085840eb7db28d9787dd2573 (patch) | |
| tree | a8d05864088d5d310d1c607c0982fda6451a7936 /Gemfile | |
| parent | 8b4602041cf2c4a8738a4796d78720017249249f (diff) | |
| download | gitlab-ce-79a091b12aab9c41085840eb7db28d9787dd2573.tar.gz | |
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.
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -89,8 +89,9 @@ gem 'kaminari', '~> 1.0' gem 'hamlit', '~> 2.8.8' # Files attachments -# 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. +# Locked until https://github.com/carrierwaveuploader/carrierwave/pull/2332 and +# https://github.com/carrierwaveuploader/carrierwave/pull/2356 are merged. +# config/initializers/carrierwave_patch.rb can be removed once both changes are released. gem 'carrierwave', '= 1.2.3' gem 'mini_magick' |