[DRE-commits] [ruby-responders] 01/05: Merge tag 'upstream/2.1.1'

[Lucas Moura]

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

lucasmoura-guest pushed a commit to branch master
in repository ruby-responders.

commit f22dd0541705f471973ae68f2aea2227bbe27af9
Merge: 48fffab c2abda7
Author: Lucas Albuquerque Medeiros de Moura <lucas.moura128 at gmail.com>
Date:   Wed Mar 2 15:49:41 2016 -0300

    Merge tag 'upstream/2.1.1'
    
    Upstream version 2.1.1
    
    # gpg: Signature made Wed 02 Mar 2016 03:49:37 PM BRT using RSA key ID 2DA5B48C
    # gpg: Good signature from "Lucas Albuquerque Medeiros de Moura <lucas.moura128 at gmail.com>"

 .travis.yml                                  | 17 +++++++--
 CHANGELOG.md                                 |  4 ++
 Gemfile                                      |  2 +-
 Gemfile.lock                                 | 53 ++++++++++++++------------
 MIT-LICENSE                                  |  2 +-
 README.md                                    | 32 +++++++++++++---
 gemfiles/Gemfile-rails.5.0.x                 |  9 +++++
 lib/action_controller/respond_with.rb        |  2 +
 lib/action_controller/responder.rb           |  2 +-
 lib/responders/controller_method.rb          |  4 +-
 lib/responders/version.rb                    |  2 +-
 responders.gemspec                           |  4 +-
 test/action_controller/respond_with_test.rb  | 35 ++++++++---------
 test/responders/controller_method_test.rb    |  2 +-
 test/responders/flash_responder_test.rb      | 57 +++++++++++++++++++---------
 test/responders/http_cache_responder_test.rb | 11 ++++--
 test/test_helper.rb                          | 27 +++++++++++++
 17 files changed, 184 insertions(+), 81 deletions(-)

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