[DRE-commits] [ruby-responders] 02/04: Merge tag 'upstream/2.1.0'

[Praveen Arimbrathodiyil]

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

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

commit 7231fc43b2075a42446fdb19918c33faad56b830
Merge: 113c413 83c0a6b
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Thu Apr 2 13:23:16 2015 +0530

    Merge tag 'upstream/2.1.0'
    
    Upstream version 2.1.0
    
    # gpg: Signature made Thursday 02 April 2015 01:23:10 PM 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>"

 .travis.yml                                        |   3 +-
 CHANGELOG.md                                       |   6 +-
 Gemfile                                            |   7 +-
 Gemfile.lock                                       | 130 +++++++--------------
 README.md                                          |  72 ++++++------
 lib/action_controller/respond_with.rb              |   4 +-
 .../rails/responders_controller_generator.rb       |  26 +----
 lib/generators/rails/templates/controller.rb       |  10 +-
 lib/generators/responders/install_generator.rb     |   8 ++
 lib/responders.rb                                  |   6 -
 lib/responders/location_responder.rb               |   2 +-
 lib/responders/version.rb                          |   2 +-
 responders.gemspec                                 |   2 +-
 test/action_controller/respond_with_test.rb        |   8 +-
 test/responders/http_cache_responder_test.rb       |   2 +-
 test/test_helper.rb                                |   2 +
 16 files changed, 114 insertions(+), 176 deletions(-)

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