Merge branch 'sh-use-gitlab-fog-google' into 'master'

Use gitlab-fog-google instead of upstream fog-google gem

See merge request gitlab-org/gitlab!56245

Gemfile

@@ -120,7 +120,7 @@ gem 'fog-aws', '~> 3.9'
 # Locked until fog-google resolves https://github.com/fog/fog-google/issues/421.
 # Also see config/initializers/fog_core_patch.rb.
 gem 'fog-core', '= 2.1.0'
-gem 'fog-google', '~> 1.12'
+gem 'gitlab-fog-google', '~> 1.13', require: 'fog/google'
 gem 'fog-local', '~> 0.6'
 gem 'fog-openstack', '~> 1.0'
 gem 'fog-rackspace', '~> 0.1.1'

Gemfile.lock

@@ -383,12 +383,6 @@ GEM
       excon (~> 0.58)
       formatador (~> 0.2)
       mime-types
-    fog-google (1.12.0)
-      fog-core (<= 2.1.0)
-      fog-json (~> 1.2)
-      fog-xml (~> 0.1.0)
-      google-api-client (>= 0.44.2, < 0.51)
-      google-cloud-env (~> 1.2)
     fog-json (1.2.0)
       fog-core
       multi_json (~> 1.10)
@@ -446,6 +440,13 @@ GEM
       fog-json (~> 1.2.0)
       mime-types
       ms_rest_azure (~> 0.12.0)
+    gitlab-fog-google (1.13.0)
+      addressable (>= 2.7.0)
+      fog-core (<= 2.1.0)
+      fog-json (~> 1.2)
+      fog-xml (~> 0.1.0)
+      google-api-client (>= 0.44.2, < 0.51)
+      google-cloud-env (~> 1.2)
     gitlab-labkit (0.16.0)
       actionpack (>= 5.0.0, < 7.0.0)
       activesupport (>= 5.0.0, < 7.0.0)
@@ -1400,7 +1401,6 @@ DEPENDENCIES
   fog-aliyun (~> 0.3)
   fog-aws (~> 3.9)
   fog-core (= 2.1.0)
-  fog-google (~> 1.12)
   fog-local (~> 0.6)
   fog-openstack (~> 1.0)
   fog-rackspace (~> 0.1.1)
@@ -1415,6 +1415,7 @@ DEPENDENCIES
   gitlab-chronic (~> 0.10.5)
   gitlab-experiment (~> 0.4.12)
   gitlab-fog-azure-rm (~> 1.0.1)
+  gitlab-fog-google (~> 1.13)
   gitlab-labkit (~> 0.16.0)
   gitlab-license (~> 1.3)
   gitlab-mail_room (~> 0.0.8)

changelogs/unreleased/sh-use-gitlab-fog-google.yml

+---
+title: Use gitlab-fog-google instead of upstream fog-google gem
+merge_request: 56245
+author:
+type: fixed