Permalink
Browse files

Merge branch 'master' into restore_1_9_3_plus_rails_4_0_and_4_1_support

  • Loading branch information...
2 parents a16ad36 + 5f8a099 commit ab9e1ed8b012ea294c75d57972f4eed4f2d3665c @timoschilling timoschilling committed on GitHub Jan 11, 2017
Showing with 2 additions and 1 deletion.
  1. +1 −0 Gemfile
  2. +1 −1 activeadmin.gemspec
View
@@ -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'
View
@@ -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'

0 comments on commit ab9e1ed

Please sign in to comment.