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

Jump to bottom

Bump kaminari from 1.1.1 to 1.2.1 #169

Closed
wants to merge 1 commit into from
Closed

Bump kaminari from 1.1.1 to 1.2.1 #169

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@ gem 'actionpack-action_caching'
# Hydra stack
gem 'nokogiri', '~> 1.8.2'
# kaminari 1.2.0 introduces a floating span close in Blacklight?
gem 'kaminari', '~> 1.1.1'
gem 'kaminari', '~> 1.2.1'
gem 'blacklight', '~> 6.0'
gem 'active-fedora', '>= 7.3.1'
# carrierwave for file uploads
Expand Down
28 changes: 14 additions & 14 deletions Gemfile.lock
View file
Open in desktop
Expand Up @@ -150,7 +150,7 @@ GEM
colorbox-rails (0.1.2)
jquery-rails
rails (>= 3.1.1)
concurrent-ruby (1.1.7)
concurrent-ruby (1.1.8)
crass (1.0.6)
cul_hydra (1.9.5)
active-fedora (>= 8.0, < 8.7.0)
Expand Down Expand Up @@ -234,18 +234,18 @@ GEM
jquery-ui-rails (6.0.1)
railties (>= 3.2.16)
json (1.8.6)
kaminari (1.1.1)
kaminari (1.2.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)
kaminari-actionview (= 1.2.1)
kaminari-activerecord (= 1.2.1)
kaminari-core (= 1.2.1)
kaminari-actionview (1.2.1)
actionview
kaminari-core (= 1.1.1)
kaminari-activerecord (1.1.1)
kaminari-core (= 1.2.1)
kaminari-activerecord (1.2.1)
activerecord
kaminari-core (= 1.1.1)
kaminari-core (1.1.1)
kaminari-core (= 1.2.1)
kaminari-core (1.2.1)
leaflet-rails (1.2.0)
rails (>= 4.2.0)
libv8 (8.4.255.0)
Expand All @@ -260,7 +260,7 @@ GEM
mime-types-data (3.2020.1104)
mini_mime (1.0.2)
mini_portile2 (2.3.0)
minitest (5.14.2)
minitest (5.14.4)
mods (2.4.1)
edtf
iso-639
Expand Down Expand Up @@ -318,7 +318,7 @@ GEM
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.11.3)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
rails-deprecated_sanitizer (1.0.4)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.9)
activesupport (>= 4.2.0, < 5.0)
Expand Down Expand Up @@ -475,7 +475,7 @@ GEM
actionpack (>= 3.1)
jquery-rails
railties (>= 3.1)
tzinfo (1.2.8)
tzinfo (1.2.9)
thread_safe (~> 0.1)
uber (0.0.15)
uglifier (2.5.0)
Expand Down Expand Up @@ -529,7 +529,7 @@ DEPENDENCIES
jettywrapper (>= 2.0.5)!
jquery-rails (~> 4.4.0)
jquery-ui-rails (~> 6.0)
kaminari (~> 1.1.1)
kaminari (~> 1.2.1)
leaflet-rails (~> 1.2.0)
libv8 (>= 8.4.255.0)
loofah (>= 2.2.1)
Expand Down