From f620ccaf32f959904fd4eb8176be0d696e411edd Mon Sep 17 00:00:00 2001 From: sue445 Date: Wed, 11 Jan 2017 17:22:52 +0900 Subject: [PATCH 1/2] Relax kaminari dependency for kaminari 1.0.0 --- activeadmin.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activeadmin.gemspec b/activeadmin.gemspec index e20184d74ee..8f172f39549 100644 --- a/activeadmin.gemspec +++ b/activeadmin.gemspec @@ -23,7 +23,7 @@ Gem::Specification.new do |s| s.add_dependency 'inherited_resources', '~> 1.6' s.add_dependency 'jquery-rails' s.add_dependency 'jquery-ui-rails' - s.add_dependency 'kaminari', '~> 0.15' + s.add_dependency 'kaminari', '>= 0.15', '< 2.0' s.add_dependency 'railties', '>= 3.2', '< 5.1' s.add_dependency 'ransack', '~> 1.3' s.add_dependency 'sass-rails' From 5dca3413fa767f3d37f329b74def3096f6496940 Mon Sep 17 00:00:00 2001 From: sue445 Date: Wed, 11 Jan 2017 21:12:56 +0900 Subject: [PATCH 2/2] Use kaminari 0.x on ruby 1.9 kaminari 1.x doesn't work on ruby 1.9 https://github.com/kaminari/kaminari/blob/v1.0.0/kaminari-core/lib/kaminari/helpers/paginator.rb#L9 uses ruby 2.0+ syntax --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 45d8339e841..13b0ac7035c 100644 --- a/Gemfile +++ b/Gemfile @@ -21,6 +21,7 @@ if rails_major == '5' end platform :ruby_19 do # Remove this block when we drop support for Ruby 1.9 + gem 'kaminari', '~> 0.15' gem 'mime-types', '< 3' gem 'nokogiri', '< 1.7' gem 'public_suffix', '< 1.5'