[DRE-commits] [ruby-jbuilder] 01/05: Merge tag 'upstream/2.3.1'

[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 84ece767203cf7e65fda11efb99d68d2182a2d9f
Merge: 788b314 d2c560c
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Aug 14 12:03:14 2015 -0300

    Merge tag 'upstream/2.3.1'
    
    Upstream version 2.3.1
    
    # gpg: Signature made Sex 14 Ago 2015 12:03:11 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>"

 .gitignore                                         |   1 +
 .travis.yml                                        |  22 +-
 Appraisals                                         |  39 ++-
 CHANGELOG.md                                       |  86 +++++
 Gemfile                                            |   1 +
 README.md                                          |  60 ++--
 checksums.yaml.gz                                  | Bin 268 -> 0 bytes
 gemfiles/rails_3_0.gemfile                         |   3 +
 gemfiles/rails_3_1.gemfile                         |   3 +
 gemfiles/rails_3_2.gemfile                         |   3 +
 gemfiles/rails_4_0.gemfile                         |   2 +
 gemfiles/rails_4_1.gemfile                         |   2 +
 gemfiles/{rails_3_0.gemfile => rails_4_2.gemfile}  |   6 +-
 gemfiles/{rails_3_0.gemfile => rails_edge.gemfile} |   4 +-
 jbuilder.gemspec                                   |   2 +-
 .../rails/scaffold_controller_generator.rb         |   4 +-
 lib/generators/rails/templates/api_controller.rb   |  63 ++++
 lib/jbuilder.rb                                    | 113 ++++---
 lib/jbuilder/blank.rb                              |  11 +
 lib/jbuilder/errors.rb                             |   7 +
 lib/jbuilder/jbuilder_template.rb                  | 113 ++++---
 lib/jbuilder/railtie.rb                            |  28 +-
 metadata.yml                                       |  12 +-
 test/jbuilder_template_test.rb                     | 352 +++++++++++++--------
 test/jbuilder_test.rb                              |  79 ++++-
 test/scaffold_api_controller_generator_test.rb     |  46 +++
 test/test_helper.rb                                |   6 +-
 27 files changed, 789 insertions(+), 279 deletions(-)

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