summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2018-03-16 13:21:14 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2018-03-16 13:21:14 +0000
commitddda94c3a4a4cd08be0014d8d816beeebd405f51 (patch)
treeffb5966cfd882a470202973bbfc293f9903154af /Gemfile.lock
parent132675802590fec52346b77188b35a7c0b34853a (diff)
parent1a096c31ff9ca74040efee6a81ca6fd2ad2634b1 (diff)
downloadgitlab-ce-ddda94c3a4a4cd08be0014d8d816beeebd405f51.tar.gz
Merge branch '44235-update-knapsack-to-1.16.0' into 'master'
Update knapsack to 1.16.0 Closes #44235 See merge request gitlab-org/gitlab-ce!17735
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock5
1 files changed, 2 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 10b683a44ee..8a0da87ba7e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -450,9 +450,8 @@ GEM
kaminari-core (= 1.0.1)
kaminari-core (1.0.1)
kgio (2.10.0)
- knapsack (1.11.0)
+ knapsack (1.16.0)
rake
- timecop (>= 0.1.0)
kubeclient (2.2.0)
http (= 0.9.8)
recursive-open-struct (= 1.0.0)
@@ -1089,7 +1088,7 @@ DEPENDENCIES
json-schema (~> 2.8.0)
jwt (~> 1.5.6)
kaminari (~> 1.0)
- knapsack (~> 1.11.0)
+ knapsack (~> 1.16)
kubeclient (~> 2.2.0)
letter_opener_web (~> 1.3.0)
license_finder (~> 3.1)