[DRE-commits] [ruby-will-paginate] 02/02: Merge tag 'upstream/3.1.5'

[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-will-paginate.

commit 40c1d731b4af06a69afeeca8391283634dbb97ca
Merge: f6472bc eaa74fd
Author: Abhijith PA <abhijith at openmailbox.org>
Date:   Sun Nov 13 12:19:55 2016 +0530

    Merge tag 'upstream/3.1.5'
    
    Upstream version 3.1.5

 README.md                                          |  2 +-
 lib/will_paginate/active_record.rb                 |  4 ++--
 lib/will_paginate/railtie.rb                       | 22 ++++++++++--------
 lib/will_paginate/version.rb                       |  2 +-
 lib/will_paginate/view_helpers/action_view.rb      |  4 +++-
 lib/will_paginate/view_helpers/link_renderer.rb    | 18 +++++++--------
 .../view_helpers/link_renderer_base.rb             |  2 +-
 metadata.yml                                       |  4 ++--
 spec/database.yml                                  | 18 +++++++++------
 spec/view_helpers/action_view_spec.rb              | 27 +++++++++++++++++-----
 spec/view_helpers/view_example_group.rb            |  2 +-
 11 files changed, 65 insertions(+), 40 deletions(-)

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