diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-03-16 13:21:14 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-03-16 13:21:14 +0000 |
| commit | ddda94c3a4a4cd08be0014d8d816beeebd405f51 (patch) | |
| tree | ffb5966cfd882a470202973bbfc293f9903154af | |
| parent | 132675802590fec52346b77188b35a7c0b34853a (diff) | |
| parent | 1a096c31ff9ca74040efee6a81ca6fd2ad2634b1 (diff) | |
| download | gitlab-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
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/44235-update-knapsack-to-1-16-0.yml | 5 |
3 files changed, 8 insertions, 4 deletions
@@ -359,7 +359,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 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) 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 00000000000..265d36b763f --- /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 |