diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2017-01-26 11:25:40 -0700 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2017-01-26 11:25:40 -0700 |
| commit | ce8b2ed8a81399489184234020ab06c3ec4f7ed1 (patch) | |
| tree | 668f19d71b29223f69f9a7fd2a2d0db272807c8d | |
| parent | d391f743841132375ccf9f9aaddb649ded83f584 (diff) | |
| download | gitlab-ce-cs-update-kaminari.tar.gz | |
Update Kaminari to 1.0.1 and add kaminari-grape gem.cs-update-kaminari
Changelog: https://github.com/kaminari/kaminari/blob/011cd6c783d5165e0e542c2b3c1a9e0018631aab/CHANGELOG.md#101
kaminari-grape: https://github.com/kaminari/kaminari-grape
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | Gemfile.lock | 21 |
2 files changed, 19 insertions, 5 deletions
@@ -70,7 +70,8 @@ gem 'grape-entity', '~> 0.6.0' gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' # Pagination -gem 'kaminari', '~> 0.17.0' +gem 'kaminari', '~> 1.0.0' +gem 'kaminari-grape', '~> 1.0.0' # HAML gem 'hamlit', '~> 2.6.1' diff --git a/Gemfile.lock b/Gemfile.lock index 133e47e1ea4..8817bb94542 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -380,9 +380,21 @@ GEM json-schema (2.6.2) addressable (~> 2.3.8) jwt (1.5.4) - kaminari (0.17.0) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) + kaminari (1.0.1) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.0.1) + kaminari-activerecord (= 1.0.1) + kaminari-core (= 1.0.1) + kaminari-actionview (1.0.1) + actionview + kaminari-core (= 1.0.1) + kaminari-activerecord (1.0.1) + activerecord + kaminari-core (= 1.0.1) + kaminari-core (1.0.1) + kaminari-grape (1.0.1) + grape + kaminari-core (~> 1.0) kgio (2.10.0) knapsack (1.11.0) rake @@ -907,7 +919,8 @@ DEPENDENCIES jquery-ui-rails (~> 5.0.0) json-schema (~> 2.6.2) jwt - kaminari (~> 0.17.0) + kaminari (~> 1.0.0) + kaminari-grape (~> 1.0.0) knapsack (~> 1.11.0) kubeclient (~> 2.2.0) letter_opener_web (~> 1.3.0) |