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
This commit is contained in:
commit
ddda94c3a4
2
Gemfile
2
Gemfile
|
@ -359,7 +359,7 @@ group :development, :test do
|
||||||
gem 'benchmark-ips', '~> 2.3.0', require: false
|
gem 'benchmark-ips', '~> 2.3.0', require: false
|
||||||
|
|
||||||
gem 'license_finder', '~> 3.1', 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'
|
gem 'activerecord_sane_schema_dumper', '0.2'
|
||||||
|
|
||||||
|
|
|
@ -450,9 +450,8 @@ GEM
|
||||||
kaminari-core (= 1.0.1)
|
kaminari-core (= 1.0.1)
|
||||||
kaminari-core (1.0.1)
|
kaminari-core (1.0.1)
|
||||||
kgio (2.10.0)
|
kgio (2.10.0)
|
||||||
knapsack (1.11.0)
|
knapsack (1.16.0)
|
||||||
rake
|
rake
|
||||||
timecop (>= 0.1.0)
|
|
||||||
kubeclient (2.2.0)
|
kubeclient (2.2.0)
|
||||||
http (= 0.9.8)
|
http (= 0.9.8)
|
||||||
recursive-open-struct (= 1.0.0)
|
recursive-open-struct (= 1.0.0)
|
||||||
|
@ -1089,7 +1088,7 @@ DEPENDENCIES
|
||||||
json-schema (~> 2.8.0)
|
json-schema (~> 2.8.0)
|
||||||
jwt (~> 1.5.6)
|
jwt (~> 1.5.6)
|
||||||
kaminari (~> 1.0)
|
kaminari (~> 1.0)
|
||||||
knapsack (~> 1.11.0)
|
knapsack (~> 1.16)
|
||||||
kubeclient (~> 2.2.0)
|
kubeclient (~> 2.2.0)
|
||||||
letter_opener_web (~> 1.3.0)
|
letter_opener_web (~> 1.3.0)
|
||||||
license_finder (~> 3.1)
|
license_finder (~> 3.1)
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Update knapsack to 1.16.0
|
||||||
|
merge_request: 17735
|
||||||
|
author: Takuya Noguchi
|
||||||
|
type: other
|
Loading…
Reference in New Issue