summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2018-11-27 11:18:36 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2018-11-27 11:18:36 +0000
commit921d6b1a13b5ec59217ab714b4daa6800500d95f (patch)
tree47ed920e09bc88f959be5f8169ead813e5ccadc6 /Gemfile.lock
parent3a3a767c4a4fa4ca7a2858d5c5940e557661187a (diff)
parentca52b32b4632bcd8d4ae10c082abf82ff2459b0d (diff)
downloadgitlab-ce-921d6b1a13b5ec59217ab714b4daa6800500d95f.tar.gz
Merge branch 'upgrade_kubeclient_400' into 'master'
Upgrade kubeclient to 4.0.0 See merge request gitlab-org/gitlab-ce!23261
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock12
1 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index fdcac3b3952..f622c6292b2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -367,14 +367,14 @@ GEM
html2text (0.2.0)
nokogiri (~> 1.6)
htmlentities (4.3.4)
- http (2.2.2)
+ http (3.3.0)
addressable (~> 2.3)
http-cookie (~> 1.0)
- http-form_data (~> 1.0.1)
+ http-form_data (~> 2.0)
http_parser.rb (~> 0.6.0)
http-cookie (1.0.3)
domain_name (~> 0.5)
- http-form_data (1.0.3)
+ http-form_data (2.1.1)
http_parser.rb (0.6.0)
httparty (0.13.7)
json (~> 1.8)
@@ -418,8 +418,8 @@ GEM
kgio (2.10.0)
knapsack (1.17.0)
rake
- kubeclient (3.1.0)
- http (~> 2.2.2)
+ kubeclient (4.0.0)
+ http (~> 3.0)
recursive-open-struct (~> 1.0, >= 1.0.4)
rest-client (~> 2.0)
launchy (2.4.3)
@@ -1042,7 +1042,7 @@ DEPENDENCIES
jwt (~> 1.5.6)
kaminari (~> 1.0)
knapsack (~> 1.17)
- kubeclient (~> 3.1.0)
+ kubeclient (~> 4.0.0)
letter_opener_web (~> 1.3.0)
license_finder (~> 5.4)
licensee (~> 8.9)