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
carrierwaveuploader/carrierwave#2356.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53846.

changelogs/unreleased/sh-carrierwave-patch-google-acl.yml

@@ -0,0 +1,5 @@
+---
+title: Fix Carrierwave not working properly with Google S3 compatibility
+merge_request: 23858
+author:
+type: fixed

config/initializers/carrierwave_patch.rb

@@ -23,6 +23,19 @@ def authenticated_url(options = {})
             end
           end
         end
+
+        # Fix for https://github.com/carrierwaveuploader/carrierwave/pull/2356
+        def acl_header
+          if fog_provider == 'AWS'
+            { 'x-amz-acl' => @uploader.fog_public ? 'public-read' : 'private' }
+          else
+            {}
+          end
+        end
+
+        def fog_provider
+          @uploader.fog_credentials[:provider].to_s
+        end
       end
     end
   end