summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Botelho <tiagonbotelho@hotmail.com>2018-05-29 11:38:36 +0100
committerTiago Botelho <tiagonbotelho@hotmail.com>2018-05-29 11:45:19 +0100
commit5d492861883d5c8a85808cfc2759defc1e084ba5 (patch)
treef978831e72d9e072c089ea7bc28400039701e06e
parentc5adf04cd69035a7a1737df8c2303bc228ea4089 (diff)
downloadgitlab-ce-bump-kubeclient-version-3-1-0.tar.gz
Bumps kubeclient gem version to 3.1.0bump-kubeclient-version-3-1-0
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock10
-rw-r--r--changelogs/unreleased/bump-kubeclient-version-3-1-0.yml5
3 files changed, 11 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index b6b82bad8a4..e8ee68c1163 100644
--- a/Gemfile
+++ b/Gemfile
@@ -219,7 +219,7 @@ gem 'asana', '~> 0.6.0'
gem 'ruby-fogbugz', '~> 0.2.1'
# Kubernetes integration
-gem 'kubeclient', '~> 3.0'
+gem 'kubeclient', '~> 3.1.0'
# Sanitize user input
gem 'sanitize', '~> 2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index b0b7bb537a8..ef36fcd7ab9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -168,7 +168,7 @@ GEM
diff-lcs (1.3)
diffy (3.1.0)
docile (1.1.5)
- domain_name (0.5.20170404)
+ domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
doorkeeper (4.3.2)
railties (>= 4.2)
@@ -446,9 +446,9 @@ GEM
knapsack (1.16.0)
rake
timecop (>= 0.1.0)
- kubeclient (3.0.0)
+ kubeclient (3.1.0)
http (~> 2.2.2)
- recursive-open-struct (~> 1.0.4)
+ recursive-open-struct (~> 1.0, >= 1.0.4)
rest-client (~> 2.0)
launchy (2.4.3)
addressable (~> 2.3)
@@ -699,7 +699,7 @@ GEM
re2 (1.1.1)
recaptcha (3.0.0)
json
- recursive-open-struct (1.0.5)
+ recursive-open-struct (1.1.0)
redcarpet (3.4.0)
redis (3.3.5)
redis-actionpack (5.0.2)
@@ -1068,7 +1068,7 @@ DEPENDENCIES
jwt (~> 1.5.6)
kaminari (~> 1.0)
knapsack (~> 1.16)
- kubeclient (~> 3.0)
+ kubeclient (~> 3.1.0)
letter_opener_web (~> 1.3.0)
license_finder (~> 3.1)
licensee (~> 8.9)
diff --git a/changelogs/unreleased/bump-kubeclient-version-3-1-0.yml b/changelogs/unreleased/bump-kubeclient-version-3-1-0.yml
new file mode 100644
index 00000000000..24f240410b0
--- /dev/null
+++ b/changelogs/unreleased/bump-kubeclient-version-3-1-0.yml
@@ -0,0 +1,5 @@
+---
+title: Updates the version of kubeclient from 3.0 to 3.1.0
+merge_request: 19199
+author:
+type: other