Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 18 deletions

diff --git a/Gemfile.lock b/Gemfile.lock
index 3da30ec4c72..2a9b9721576 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,14 +1,3 @@
-GIT
-  remote: https://github.com/dhstewart/kubeclient.git
-  revision: 17e7dbeacf1e54a61182ac0ada10c346c4f0b37d
-  ref: 17e7dbeacf1e54a61182ac0ada10c346c4f0b37d
-  specs:
-    kubeclient (4.9.4)
-      http (>= 3.0, < 6.0)
-      jsonpath (~> 1.0)
-      recursive-open-struct (~> 1.1, >= 1.1.1)
-      rest-client (~> 2.0)
-
 PATH
   remote: vendor/gems/attr_encrypted
   specs:
@@ -759,15 +748,17 @@ GEM
       nokogiri (~> 1.6)
     htmlbeautifier (1.4.2)
     htmlentities (4.3.4)
-    http (5.1.0)
-      addressable (~> 2.8)
+    http (4.4.1)
+      addressable (~> 2.3)
       http-cookie (~> 1.0)
       http-form_data (~> 2.2)
-      llhttp-ffi (~> 0.4.0)
+      http-parser (~> 1.2.0)
     http-accept (1.7.0)
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
+    http-parser (1.2.3)
+      ffi-compiler (>= 1.0, < 2.0)
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
@@ -832,6 +823,11 @@ GEM
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
+    kubeclient (4.9.3)
+      http (>= 3.0, < 5.0)
+      jsonpath (~> 1.0)
+      recursive-open-struct (~> 1.1, >= 1.1.1)
+      rest-client (~> 2.0)
     launchy (2.5.0)
       addressable (~> 2.7)
     lefthook (1.2.6)
@@ -859,9 +855,6 @@ GEM
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    llhttp-ffi (0.4.0)
-      ffi-compiler (~> 1.0)
-      rake (~> 13.0)
     locale (2.1.3)
     lockbox (0.6.2)
     lograge (0.11.2)
@@ -1717,7 +1710,7 @@ DEPENDENCIES
   kas-grpc (~> 0.0.2)
   knapsack (~> 1.21.1)
   kramdown (~> 2.3.1)
-  kubeclient!
+  kubeclient (~> 4.9.3)
   lefthook (~> 1.2.6)
   letter_opener_web (~> 2.0.0)
   license_finder (~> 7.0)