[DRE-commits] [ruby-addressable] 01/07: Merge tag 'upstream/2.4.0'

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-addressable.

commit 7821114e67007ef461ef00f9143b6f6e91066d3f
Merge: 3584768 3402230
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sat Jun 4 14:51:06 2016 +0200

    Merge tag 'upstream/2.4.0'
    
    Upstream version 2.4.0
    
    # gpg: Signature faite le sam. 04 juin 2016 14:51:05 CEST
    # gpg:                avec la clef RSA 0x89AF82B739CD217A
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> » [ultime]
    # Empreinte de clef principale : 3041 4D81 DC28 290C 2568  6DE3 DA49 58F6 11E1 49E9
    #    Empreinte de la sous-clef : 9CCD 6B31 9DBF 8E40 AB1A  BD1A 89AF 82B7 39CD 217A

 CHANGELOG.md                               |  12 ++
 Gemfile                                    |  26 +--
 README.md                                  |   8 +-
 Rakefile                                   |   6 +-
 addressable.gemspec                        |  28 +--
 lib/addressable.rb                         |   2 +
 lib/addressable/idna/pure.rb               |   5 +-
 lib/addressable/template.rb                | 149 ++++++++++++--
 lib/addressable/uri.rb                     | 311 +++++++++++++++++------------
 lib/addressable/version.rb                 |   4 +-
 metadata.yml                               |  74 +------
 spec/addressable/idna_spec.rb              |  16 ++
 spec/addressable/rack_mount_compat_spec.rb | 104 ++++++++++
 spec/addressable/security_spec.rb          |  57 ++++++
 spec/addressable/template_spec.rb          |  53 ++++-
 spec/addressable/uri_spec.rb               | 177 +++++++++++++++-
 spec/spec_helper.rb                        |  11 +-
 tasks/gem.rake                             |   9 +-
 tasks/rspec.rake                           |  34 +---
 website/index.html                         | 110 ----------
 20 files changed, 792 insertions(+), 404 deletions(-)

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