diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-05-31 14:14:16 -0600 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-05-31 14:14:16 -0600 |
| commit | 7f4f959e9bed5ca0781b97e781662c6fda69844d (patch) | |
| tree | 1e95e9fed4be9d0412bb13201a6c3d123a288d4e /Gemfile.lock | |
| parent | 4ec1b65beada0f7992e9aa1ead54f22f1fa3ae3c (diff) | |
| download | gitlab-ce-7f4f959e9bed5ca0781b97e781662c6fda69844d.tar.gz | |
Upgrade Kaminari from 0.16.3 to 0.17.0.
Changelog: https://github.com/amatsuda/kaminari/blob/master/CHANGELOG.rdoc#0170
Deprecates num_pages in favor of total_pages and includes Rails 5 support.
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index fa2b72b2524..146e95167b2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -442,7 +442,7 @@ GEM railties (>= 3.2.16) json (1.8.3) jwt (1.5.2) - kaminari (0.16.3) + kaminari (0.17.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) kgio (2.10.0) @@ -959,7 +959,7 @@ DEPENDENCIES jquery-turbolinks (~> 2.1.0) jquery-ui-rails (~> 5.0.0) jwt - kaminari (~> 0.16.3) + kaminari (~> 0.17.0) letter_opener_web (~> 1.3.0) licensee (~> 8.0.0) loofah (~> 2.0.3) |