[DRE-commits] [ruby-gon] 01/05: Merge tag 'upstream/5.0.1'

[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 b338fc4b36163c2d16189f00e1d519ee81617870
Merge: 67b61b6 225af91
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Jan 2 22:41:36 2014 +0100

    Merge tag 'upstream/5.0.1'
    
    Upstream version 5.0.1
    
    # gpg: Signature faite le jeu. 02 janv. 2014 22:41:27 CET avec la clef RSA d'identifiant 8F9F8F09
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> »
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> »

 .gitignore                                      |   1 +
 .travis.yml                                     |   8 +--
 CHANGELOG.md                                    |  19 ++++++
 README.md                                       |   6 +-
 README_old.md                                   |   2 +-
 Rakefile                                        |   2 +-
 checksums.yaml.gz                               | Bin 0 -> 269 bytes
 gon.gemspec                                     |  29 +++++----
 lib/gon.rb                                      |  24 +++----
 lib/gon/base.rb                                 |  83 +++++++++++++++++-------
 lib/gon/escaper.rb                              |  15 ++++-
 lib/gon/helpers.rb                              |  23 ++++---
 lib/gon/jbuilder.rb                             |  28 +++++---
 lib/gon/rabl.rb                                 |   6 +-
 lib/gon/request.rb                              |  43 ++++++------
 lib/gon/version.rb                              |   2 +-
 lib/gon/watch.rb                                |   3 +-
 metadata.yml                                    |  60 +++++++----------
 spec/gon/basic_spec.rb                          |  77 +++++++++++++++-------
 spec/gon/global_spec.rb                         |  37 +++++------
 spec/gon/jbuilder_spec.rb                       |  11 ++--
 spec/gon/rabl_with_rabl_rails_spec.rb           |  28 ++++----
 spec/gon/rabl_with_rabl_spec.rb                 |  32 ++++-----
 spec/gon/templates_spec.rb                      |  12 ++--
 spec/gon/thread_spec.rb                         |  17 +++++
 spec/gon/watch_spec.rb                          |  10 +--
 spec/spec_helper.rb                             |   7 ++
 spec/test_data/sample_with_locals.json.jbuilder |   1 +
 28 files changed, 345 insertions(+), 241 deletions(-)

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