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.

Sign up for GitHub

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

Bump kaminari from 0.17.0 to 1.2.1 #134

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump kaminari from 0.17.0 to 1.2.1 #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ gem 'bootstrap-sass', '~> 3.4.0'
gem 'inline_svg', '~> 1.3.1'

# pagination
gem 'kaminari', '~> 0.17.0'
gem 'kaminari', '~> 1.2.1'

# pdf text extraction
gem 'docsplit', '~> 0.7.6'
Expand Down
37 changes: 23 additions & 14 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ GEM
bootstrap-sass (3.4.1)
autoprefixer-rails (>= 5.2.1)
sassc (>= 2.0.0)
builder (3.2.3)
builder (3.2.4)
byebug (10.0.2)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
Expand All @@ -64,9 +64,9 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.5)
concurrent-ruby (1.1.6)
connection_pool (2.2.2)
crass (1.0.4)
crass (1.0.6)
css_parser (1.6.0)
addressable
descendants_tracker (0.0.4)
Expand All @@ -87,7 +87,7 @@ GEM
multi_json
enumerable-lazy (0.0.2)
equalizer (0.0.11)
erubi (1.8.0)
erubi (1.9.0)
ethon (0.12.0)
ffi (>= 1.3.0)
excon (0.62.0)
Expand Down Expand Up @@ -157,7 +157,7 @@ GEM
httparty (0.16.3)
mime-types (~> 3.0)
multi_xml (>= 0.5.2)
i18n (1.6.0)
i18n (1.8.2)
concurrent-ruby (~> 1.0)
ice_nine (0.11.2)
image_optim (0.26.3)
Expand All @@ -183,9 +183,18 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
kaminari (0.17.0)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kaminari (1.2.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.1)
kaminari-activerecord (= 1.2.1)
kaminari-core (= 1.2.1)
kaminari-actionview (1.2.1)
actionview
kaminari-core (= 1.2.1)
kaminari-activerecord (1.2.1)
activerecord
kaminari-core (= 1.2.1)
kaminari-core (1.2.1)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
Expand All @@ -195,7 +204,7 @@ GEM
activesupport (>= 4)
railties (>= 4)
request_store (~> 1.0)
loofah (2.2.3)
loofah (2.5.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
Expand Down Expand Up @@ -250,7 +259,7 @@ GEM
premailer (~> 1.7, >= 1.7.9)
progress (3.5.0)
puma (3.12.2)
rack (2.0.7)
rack (2.2.2)
rack-accept (0.4.5)
rack (>= 0.4)
rack-cors (1.0.2)
Expand All @@ -277,8 +286,8 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
rails-i18n (5.1.3)
i18n (>= 0.7, < 2)
railties (>= 5.0, < 6)
Expand Down Expand Up @@ -352,7 +361,7 @@ GEM
turbolinks-source (5.2.0)
typhoeus (1.3.1)
ethon (>= 0.9.0)
tzinfo (1.2.5)
tzinfo (1.2.7)
thread_safe (~> 0.1)
uglifier (4.1.20)
execjs (>= 0.3.0, < 3)
Expand Down Expand Up @@ -409,7 +418,7 @@ DEPENDENCIES
inline_svg (~> 1.3.1)
jbuilder (~> 2.3)
jquery-rails
kaminari (~> 0.17.0)
kaminari (~> 1.2.1)
listen
lograge (~> 0.9.0)
mechanize (~> 2.7.3)
Expand Down