[DRE-commits] [ruby-gon] 01/03: Merge tag 'upstream/5.0.4'

[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-gon.

commit dd2aabc1a188ed773eb5169988d700796ed0758c
Merge: f347278 bb0de06
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Feb 27 16:46:13 2014 +0100

    Merge tag 'upstream/5.0.4'
    
    Upstream version 5.0.4
    
    # gpg: Signature faite le jeu. 27 févr. 2014 16:46:09 CET
    # gpg:                avec la clef RSA 0xDA4958F611E149E9
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> »
    # gpg: Attention : cette clef n'est pas certifiée avec une signature de confiance.
    # gpg:             Rien n'indique que la signature appartient à son propriétaire.
    # Empreinte de clef principale : 3041 4D81 DC28 290C 2568  6DE3 DA49 58F6 11E1 49E9

 .travis.yml                           |   1 +
 CHANGELOG.md                          |  13 +++++++
 Gemfile                               |   5 +++
 LICENSE                               |   9 +++++
 README.md                             |   8 ----
 Rakefile                              |   9 +++--
 checksums.yaml.gz                     | Bin 269 -> 270 bytes
 gon.gemspec                           |   1 +
 lib/gon.rb                            |   7 +++-
 lib/gon/base.rb                       |  11 ++++--
 lib/gon/escaper.rb                    |   2 +-
 lib/gon/helpers.rb                    |   2 +-
 lib/gon/version.rb                    |   2 +-
 lib/gon/watch.rb                      |   2 +-
 metadata.yml                          |  46 ++++++++++++-----------
 spec/gon/basic_spec.rb                |  69 +++++++++++++++++++---------------
 spec/gon/global_spec.rb               |  40 ++++++++++----------
 spec/gon/jbuilder_spec.rb             |  12 +++---
 spec/gon/rabl_with_rabl_rails_spec.rb |  10 ++---
 spec/gon/rabl_with_rabl_spec.rb       |  16 ++++----
 spec/gon/templates_spec.rb            |   6 +--
 spec/gon/thread_spec.rb               |  34 ++++++++++++++---
 spec/gon/watch_spec.rb                |  10 ++---
 spec/spec_helper.rb                   |   2 +-
 24 files changed, 191 insertions(+), 126 deletions(-)

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