From 9c04ac31d5fd7aee2ff0585b9f86b512721779a9 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 28 Oct 2019 16:03:58 +0200 Subject: [PATCH] Update `kaminari` gem --- Gemfile | 4 +--- Gemfile.lock | 21 +++++++++++++++------ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index bac886402f..8660fa47ae 100644 --- a/Gemfile +++ b/Gemfile @@ -34,9 +34,7 @@ gem 'sass-rails', '5.0.6' # sass style gem 'coffee-rails', '~> 4.2' gem 'jquery-rails' gem 'selectize-rails', '0.12.1' # include selectize.js for select - -# view helpers -gem 'kaminari', '0.16.3' # pagination +gem 'kaminari' gem 'coderay', '1.1.0' # xml console visualize gem 'select2-rails', '3.5.9.3' # for autocomplete gem 'cancancan' diff --git a/Gemfile.lock b/Gemfile.lock index 72ccd9ff1d..b414b4ec15 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -147,7 +147,7 @@ GEM unicode_utils (~> 1.4) crack (0.4.3) safe_yaml (~> 1.0.0) - crass (1.0.4) + crass (1.0.5) daemons (1.2.4) daemons-rails (1.2.1) daemons @@ -208,12 +208,21 @@ GEM jquery-ui-rails (5.0.5) railties (>= 3.2.16) json (1.8.6) - kaminari (0.16.3) - actionpack (>= 3.0.0) - activesupport (>= 3.0.0) + kaminari (1.1.1) + activesupport (>= 4.1.0) + kaminari-actionview (= 1.1.1) + kaminari-activerecord (= 1.1.1) + kaminari-core (= 1.1.1) + kaminari-actionview (1.1.1) + actionview + kaminari-core (= 1.1.1) + kaminari-activerecord (1.1.1) + activerecord + kaminari-core (= 1.1.1) + kaminari-core (1.1.1) keystores (0.4.0) libxml-ruby (3.0.0) - loofah (2.3.0) + loofah (2.3.1) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) @@ -449,7 +458,7 @@ DEPENDENCIES iso8601 (= 0.8.6) jquery-rails jquery-ui-rails (= 5.0.5) - kaminari (= 0.16.3) + kaminari lhv! mina (= 0.3.1) minitest (~> 5.10.0)