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 1.1.1 to 1.2.1 #75

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

Bump kaminari from 1.1.1 to 1.2.1 #75

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 @@ -19,7 +19,7 @@ gem "bootstrap", "~> 4.3.1"
gem "jquery-rails"
gem "font-awesome-rails", "~> 4.7", ">= 4.7.0.5"
gem "toastr-rails"
gem "kaminari", "~> 1.1", ">= 1.1.1"
gem "kaminari", "~> 1.2"
gem "bootstrap4-kaminari-views"
gem "config", "~> 2.0"
gem "cocoon"
Expand Down
42 changes: 21 additions & 21 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ GEM
bootstrap4-kaminari-views (1.0.1)
kaminari (>= 0.13)
rails (>= 3.1)
builder (3.2.3)
builder (3.2.4)
byebug (11.0.1)
carrierwave (1.3.1)
activemodel (>= 4.0.0)
Expand All @@ -79,7 +79,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
concurrent-ruby (1.1.5)
concurrent-ruby (1.1.6)
config (2.0.0)
activesupport (>= 4.2)
deep_merge (~> 1.2, >= 1.2.1)
Expand All @@ -91,7 +91,7 @@ GEM
country_select (4.0.0)
countries (~> 3.0)
sort_alphabetical (~> 1.0)
crass (1.0.4)
crass (1.0.6)
database_cleaner (1.7.0)
deep_merge (1.2.1)
devise (4.7.0)
Expand Down Expand Up @@ -131,7 +131,7 @@ GEM
dry-equalizer (~> 0.2, >= 0.2.2)
dry-inflector (~> 0.1, >= 0.1.2)
dry-logic (~> 1.0, >= 1.0.2)
erubi (1.8.0)
erubi (1.9.0)
execjs (2.7.0)
faker (2.2.0)
i18n (>= 0.8)
Expand All @@ -142,7 +142,7 @@ GEM
railties (>= 3.2, < 6.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
i18n (1.6.0)
i18n (1.8.2)
concurrent-ruby (~> 1.0)
i18n_data (0.8.0)
io-like (0.3.0)
Expand All @@ -155,23 +155,23 @@ GEM
thor (>= 0.14, < 2.0)
jquery-ui-rails (6.0.1)
railties (>= 3.2.16)
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)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.2.3)
loofah (2.5.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
Expand All @@ -186,11 +186,11 @@ GEM
mini_magick (4.9.5)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.11.3)
minitest (5.14.1)
msgpack (1.3.1)
mysql2 (0.5.2)
nio4r (2.5.1)
nokogiri (1.10.4)
nokogiri (1.10.9)
mini_portile2 (~> 2.4.0)
orm_adapter (0.5.0)
parallel (1.17.0)
Expand Down Expand Up @@ -222,8 +222,8 @@ GEM
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.2.0)
loofah (~> 2.2, >= 2.2.2)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (5.2.3)
actionpack (= 5.2.3)
activesupport (= 5.2.3)
Expand Down Expand Up @@ -323,7 +323,7 @@ GEM
tilt (2.0.9)
toastr-rails (1.0.3)
railties (>= 3.1.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 @@ -362,7 +362,7 @@ DEPENDENCIES
jbuilder (~> 2.5)
jquery-rails
jquery-ui-rails
kaminari (~> 1.1, >= 1.1.1)
kaminari (~> 1.2)
listen (>= 3.0.5, < 3.2)
mini_magick (~> 4.3)
mysql2 (>= 0.4.4, < 0.6.0)
Expand Down