[DRE-commits] [ruby-kaminari] 01/01: Merge tag 'upstream/0.17.0'

[Abhijith PA]

This is an automated email from the git hooks/post-receive script.

abhijithpa-guest pushed a commit to branch master
in repository ruby-kaminari.

commit bc34acd2f0dc40b2845898a8d47a25f18649e8ed
Merge: 6c3960d 73eb5e0
Author: Abhijith PA <abhijith at openmailbox.org>
Date:   Sun Jun 12 13:19:08 2016 +0530

    Merge tag 'upstream/0.17.0'
    
    Upstream version 0.17.0

 .travis.yml                                        | 51 +++++++++++-----------
 CHANGELOG.rdoc                                     | 27 ++++++++++++
 README.rdoc                                        |  2 +-
 Rakefile                                           | 23 +++++++++-
 gemfiles/active_record_30.gemfile                  |  4 +-
 gemfiles/active_record_31.gemfile                  |  9 +---
 gemfiles/active_record_32.gemfile                  | 10 +----
 gemfiles/active_record_40.gemfile                  |  1 +
 gemfiles/active_record_41.gemfile                  |  1 +
 gemfiles/active_record_42.gemfile                  |  1 +
 gemfiles/data_mapper_12.gemfile                    |  9 +---
 gemfiles/mongo_mapper.gemfile                      | 16 +++----
 gemfiles/mongoid_24.gemfile                        | 25 -----------
 gemfiles/mongoid_30.gemfile                        |  1 +
 gemfiles/mongoid_31.gemfile                        |  1 +
 gemfiles/mongoid_40.gemfile                        |  1 +
 .../{mongoid_40.gemfile => mongoid_50.gemfile}     |  9 +++-
 gemfiles/sinatra_13.gemfile                        |  9 +---
 gemfiles/sinatra_14.gemfile                        | 20 +++------
 kaminari.gemspec                                   | 20 ++++-----
 lib/kaminari/helpers/action_view_extension.rb      |  2 +-
 lib/kaminari/helpers/paginator.rb                  |  2 +-
 lib/kaminari/helpers/tags.rb                       |  5 ++-
 lib/kaminari/hooks.rb                              | 45 +++++++++++++------
 lib/kaminari/models/mongoid_extension.rb           |  2 +-
 lib/kaminari/models/page_scope_methods.rb          |  7 ++-
 lib/kaminari/railtie.rb                            |  2 +-
 lib/kaminari/sinatra.rb                            |  2 +
 lib/kaminari/version.rb                            |  2 +-
 metadata.yml                                       |  8 ++--
 spec/fake_app/mongoid/config.rb                    |  4 +-
 spec/helpers/action_view_extension_spec.rb         | 12 +++++
 32 files changed, 179 insertions(+), 154 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-kaminari.git