[DRE-commits] [ruby-jbuilder] 01/06: Merge tag 'upstream/2.1.3'

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-jbuilder.

commit e9b1580c439758e49a6faea0f8be0f204cb5c637
Merge: 06209d3 1d60d70
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Jul 27 12:38:48 2014 -0300

    Merge tag 'upstream/2.1.3'
    
    Upstream version 2.1.3
    
    # gpg: Signature made Dom 27 Jul 2014 12:38:42 BRT using RSA key ID CD460BDE
    # gpg: Good signature from "Antonio Terceiro <terceiro at softwarelivre.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at dcc.ufba.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at colivre.coop.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at debian.org>"
    # gpg:                 aka "Antonio Terceiro <antonio.terceiro at linaro.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at cs.ubc.ca>"

 .gitignore                                   |   2 +-
 .travis.yml                                  |  40 +-
 Appraisals                                   |  24 ++
 CHANGELOG.md                                 | 117 ++++++
 Gemfile                                      |   7 +-
 Gemfile.edge                                 |  10 -
 MIT-LICENSE                                  |   4 +-
 README.md                                    | 105 ++++-
 Rakefile                                     |  29 +-
 checksums.yaml.gz                            | Bin 421 -> 268 bytes
 gemfiles/rails_3_0.gemfile                   |  11 +
 gemfiles/rails_3_1.gemfile                   |  11 +
 gemfiles/rails_3_2.gemfile                   |  11 +
 gemfiles/rails_4_0.gemfile                   |  11 +
 gemfiles/rails_4_1.gemfile                   |  11 +
 jbuilder.gemspec                             |  20 +-
 lib/generators/rails/jbuilder_generator.rb   |   4 +
 lib/generators/rails/templates/controller.rb |  10 +-
 lib/jbuilder.rb                              | 200 +++++-----
 lib/jbuilder/dependency_tracker.rb           |  61 +++
 lib/jbuilder/errors.rb                       |  10 +
 lib/jbuilder/jbuilder.rb                     |   7 +
 lib/jbuilder/jbuilder_template.rb            | 128 ++++--
 lib/jbuilder/key_formatter.rb                |  34 ++
 metadata.yml                                 |  80 ++--
 test/jbuilder_dependency_tracker_test.rb     |  72 ++++
 test/jbuilder_generator_test.rb              |   5 +-
 test/jbuilder_template_test.rb               | 164 +++++++-
 test/jbuilder_test.rb                        | 565 ++++++++++++++-------------
 test/scaffold_controller_generator_test.rb   |  13 +-
 test/test_helper.rb                          |  10 +
 31 files changed, 1229 insertions(+), 547 deletions(-)

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