diff --git a/Gemfile b/Gemfile index 267417f9dade..e23353bfc434 100644 --- a/Gemfile +++ b/Gemfile @@ -26,7 +26,7 @@ gem "invalid_utf8_rejector", "~> 0.0.4" gem "isbn_validation" gem "jbuilder" gem "jquery-ui-rails", "~> 4.2.1" -gem "kaminari", "~> 1.1.1" +gem "kaminari", "~> 1.2.0" gem "link_header" gem "mime-types", "~> 3.3" gem "mini_magick", "~> 4.9.5" diff --git a/Gemfile.lock b/Gemfile.lock index 31c342dd2dc4..23b9eca081e1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -250,18 +250,18 @@ GEM json-schema (2.8.1) addressable (>= 2.4) jwt (2.2.1) - kaminari (1.1.1) + kaminari (1.2.0) 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.0) + kaminari-activerecord (= 1.2.0) + kaminari-core (= 1.2.0) + kaminari-actionview (1.2.0) actionview - kaminari-core (= 1.1.1) - kaminari-activerecord (1.1.1) + kaminari-core (= 1.2.0) + kaminari-activerecord (1.2.0) activerecord - kaminari-core (= 1.1.1) - kaminari-core (1.1.1) + kaminari-core (= 1.2.0) + kaminari-core (1.2.0) kgio (2.11.3) kramdown (1.15.0) launchy (2.4.3) @@ -601,7 +601,7 @@ DEPENDENCIES isbn_validation jbuilder jquery-ui-rails (~> 4.2.1) - kaminari (~> 1.1.1) + kaminari (~> 1.2.0) launchy link_header maxitest