From 1a096c31ff9ca74040efee6a81ca6fd2ad2634b1 Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <takninnovationresearch@gmail.com>
Date: Wed, 14 Mar 2018 07:55:08 +0900
Subject: [PATCH] Update knapsack to 1.16.0
---
Gemfile | 2 +-
Gemfile.lock | 5 ++---
changelogs/unreleased/44235-update-knapsack-to-1-16-0.yml | 5 +++++
3 files changed, 8 insertions(+), 4 deletions(-)
create mode 100644 changelogs/unreleased/44235-update-knapsack-to-1-16-0.yml
diff --git a/Gemfile b/Gemfile
index 2793463fd8192..558190ecbf9a3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -360,7 +360,7 @@ group :development, :test do
gem 'benchmark-ips', '~> 2.3.0', require: false
gem 'license_finder', '~> 3.1', require: false
- gem 'knapsack', '~> 1.11.0'
+ gem 'knapsack', '~> 1.16'
gem 'activerecord_sane_schema_dumper', '0.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index b85c7085d0790..d5961a9d72c06 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -454,9 +454,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)
@@ -1094,7 +1093,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)
diff --git a/changelogs/unreleased/44235-update-knapsack-to-1-16-0.yml b/changelogs/unreleased/44235-update-knapsack-to-1-16-0.yml
new file mode 100644
index 0000000000000..265d36b763fd3
--- /dev/null
+++ b/changelogs/unreleased/44235-update-knapsack-to-1-16-0.yml
@@ -0,0 +1,5 @@
+---
+title: Update knapsack to 1.16.0
+merge_request: 17735
+author: Takuya Noguchi
+type: other
--
GitLab