Add latest changes from gitlab-org/gitlab@master

1 files changed, 29 insertions, 21 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 49e6977020d..b65ff44c9f4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -334,7 +334,6 @@ GEM
     deckar01-task_list (2.3.2)
       html-pipeline
     declarative (0.0.20)
-    declarative-option (0.1.0)
     declarative_policy (1.1.0)
     default_value_for (3.4.0)
       activerecord (>= 3.2.0, < 7.0)
@@ -550,7 +549,6 @@ GEM
       ruby-progressbar (~> 1.4)
     fuzzyurl (0.9.0)
     gemoji (3.0.1)
-    gems (1.2.0)
     get_process_mem (0.2.7)
       ffi (~> 1.0)
     gettext (3.3.6)
@@ -622,12 +620,17 @@ GEM
       i18n (>= 0.7)
       multi_json
       request_store (>= 1.0)
-    google-api-client (0.53.0)
-      google-apis-core (~> 0.1)
-      google-apis-generator (~> 0.1)
-    google-apis-compute_v1 (0.53.0)
-      google-apis-core (>= 0.9.0, < 2.a)
-    google-apis-core (0.9.1)
+    google-apis-cloudbilling_v1 (0.21.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-cloudresourcemanager_v1 (0.31.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-compute_v1 (0.57.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-container_v1 (0.43.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-container_v1beta1 (0.43.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-core (0.10.0)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -636,24 +639,20 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-discovery_v1 (0.12.0)
-      google-apis-core (>= 0.9.0, < 2.a)
     google-apis-dns_v1 (0.28.0)
       google-apis-core (>= 0.9.0, < 2.a)
-    google-apis-generator (0.11.0)
-      activesupport (>= 5.0)
-      gems (~> 1.2)
+    google-apis-iam_v1 (0.36.0)
       google-apis-core (>= 0.9.1, < 2.a)
-      google-apis-discovery_v1 (~> 0.5)
-      thor (>= 0.20, < 2.a)
     google-apis-iamcredentials_v1 (0.15.0)
       google-apis-core (>= 0.9.0, < 2.a)
     google-apis-monitoring_v3 (0.37.0)
       google-apis-core (>= 0.9.1, < 2.a)
     google-apis-pubsub_v1 (0.30.0)
       google-apis-core (>= 0.9.1, < 2.a)
-    google-apis-sqladmin_v1beta4 (0.38.0)
-      google-apis-core (>= 0.9.0, < 2.a)
+    google-apis-serviceusage_v1 (0.28.0)
+      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-sqladmin_v1beta4 (0.41.0)
+      google-apis-core (>= 0.9.1, < 2.a)
     google-apis-storage_v1 (0.19.0)
       google-apis-core (>= 0.9.0, < 2.a)
     google-cloud-core (1.6.0)
@@ -1052,7 +1051,7 @@ GEM
     org-ruby (0.9.12)
       rubypants (~> 0.2)
     orm_adapter (0.5.0)
-    os (1.1.1)
+    os (1.1.4)
     pact (1.63.0)
       pact-mock_service (~> 3.0, >= 3.3.1)
       pact-support (~> 1.16, >= 1.16.9)
@@ -1208,9 +1207,9 @@ GEM
       redis (>= 4, < 5)
     regexp_parser (2.6.0)
     regexp_property_values (1.0.0)
-    representable (3.0.4)
+    representable (3.2.0)
       declarative (< 0.1.0)
-      declarative-option (< 0.2.0)
+      trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     request_store (1.5.1)
       rack (>= 1.4)
@@ -1479,6 +1478,7 @@ GEM
     tpm-key_attestation (0.9.0)
       bindata (~> 2.4)
       openssl-signature_algorithm (~> 0.4.0)
+    trailblazer-option (0.1.2)
     train-core (3.4.9)
       addressable (~> 2.5)
       ffi (!= 1.13.0)
@@ -1692,7 +1692,15 @@ DEPENDENCIES
   gitlab_chronic_duration (~> 0.10.6.2)
   gitlab_omniauth-ldap (~> 2.2.0)
   gon (~> 6.4.0)
-  google-api-client (~> 0.33)
+  google-apis-cloudbilling_v1 (~> 0.21.0)
+  google-apis-cloudresourcemanager_v1 (~> 0.31.0)
+  google-apis-compute_v1 (~> 0.57.0)
+  google-apis-container_v1 (~> 0.43.0)
+  google-apis-container_v1beta1 (~> 0.43.0)
+  google-apis-core (~> 0.10.0)
+  google-apis-iam_v1 (~> 0.36.0)
+  google-apis-serviceusage_v1 (~> 0.28.0)
+  google-apis-sqladmin_v1beta4 (~> 0.41.0)
   google-cloud-storage (~> 1.44.0)
   google-protobuf (~> 3.21, >= 3.21.12)
   gpgme (~> 2.0.22)