Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update kaminari gem #1392

Merged
merged 1 commit into from
Oct 28, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
21 changes: 15 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down