[DRE-commits] [ruby-kaminari] 02/03: Merge tag 'upstream/0.16.3'

[Praveen Arimbrathodiyil]

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

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

commit ea3b0bd1498d0180a160cdec81acc511ebe48957
Merge: 181c50a d9a1e93
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed May 27 09:36:21 2015 +0530

    Merge tag 'upstream/0.16.3'
    
    Upstream version 0.16.3
    
    # gpg: Signature made Wednesday 27 May 2015 09:36:16 AM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"

 .travis.yml                                        | 32 ++++++++++++++--------
 CHANGELOG.rdoc                                     | 30 ++++++++++++++++++++
 README.rdoc                                        |  4 +--
 Rakefile                                           |  4 +--
 gemfiles/active_record_31.gemfile                  |  3 ++
 gemfiles/active_record_32.gemfile                  |  3 ++
 gemfiles/active_record_40.gemfile                  |  1 +
 ..._record_40.gemfile => active_record_42.gemfile} |  6 ++--
 gemfiles/data_mapper_12.gemfile                    |  6 +++-
 gemfiles/mongo_mapper.gemfile                      | 16 +++++++----
 gemfiles/mongoid_24.gemfile                        |  4 +++
 gemfiles/mongoid_30.gemfile                        |  4 +++
 gemfiles/mongoid_31.gemfile                        |  4 +++
 gemfiles/mongoid_40.gemfile                        |  4 +++
 gemfiles/sinatra_13.gemfile                        | 31 +++++++++++++--------
 gemfiles/sinatra_14.gemfile                        |  6 +++-
 lib/generators/kaminari/views_generator.rb         | 11 ++++----
 lib/kaminari/helpers/action_view_extension.rb      |  4 ++-
 lib/kaminari/helpers/paginator.rb                  |  1 -
 lib/kaminari/helpers/sinatra_helpers.rb            |  1 +
 lib/kaminari/models/active_record_extension.rb     | 14 +++++-----
 .../models/active_record_model_extension.rb        |  2 +-
 .../models/active_record_relation_methods.rb       |  5 ++++
 lib/kaminari/models/array_extension.rb             | 12 +++++---
 lib/kaminari/models/mongoid_criteria_methods.rb    |  5 ++++
 lib/kaminari/models/mongoid_extension.rb           | 11 ++++++--
 lib/kaminari/version.rb                            |  2 +-
 metadata.yml                                       |  9 ++++--
 spec/fake_app/active_record/models.rb              |  2 +-
 spec/fake_app/mongo_mapper/config.rb               |  2 +-
 spec/fake_app/mongoid/config.rb                    |  4 +--
 spec/fake_app/mongoid/models.rb                    | 14 +++++++++-
 spec/fake_gem.rb                                   | 20 ++++++++++++--
 spec/helpers/action_view_extension_spec.rb         |  5 ++++
 .../active_record_relation_methods_spec.rb         |  6 ++++
 spec/models/active_record/inherited_spec.rb        |  9 ++++++
 spec/models/active_record/scopes_spec.rb           | 11 +++++---
 spec/models/array_spec.rb                          | 13 +++++----
 spec/models/mongoid/mongoid_spec.rb                | 31 +++++++++++++++++++++
 39 files changed, 274 insertions(+), 78 deletions(-)

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