[DRE-commits] [ruby-rabl] 01/03: Merge tag 'upstream/0.11.4'

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-rabl.

commit 53ef48173079f48bd9c4ccdafd0c7b6ff0964c18
Merge: e08c995 4d95924
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Nov 19 01:26:15 2014 +0530

    Merge tag 'upstream/0.11.4'
    
    Upstream version 0.11.4

 CHANGELOG.md                                       |  19 +
 README.md                                          |   8 +-
 checksums.yaml.gz                                  | Bin 425 -> 0 bytes
 .../test/functional/posts_controller_test.rb       |   2 +-
 .../test/functional/users_controller_test.rb       |   4 +-
 fixtures/rails4/Gemfile                            |   2 +
 .../test/functional/posts_controller_test.rb       |   2 +-
 .../test/functional/users_controller_test.rb       |   4 +-
 lib/rabl.rb                                        |  13 +-
 lib/rabl/builder.rb                                | 397 ++++++++++---------
 lib/rabl/cache_engine.rb                           |  14 +
 lib/rabl/configuration.rb                          |   6 +-
 lib/rabl/engine.rb                                 | 439 ++++++++++++---------
 lib/rabl/helpers.rb                                |  69 +++-
 lib/rabl/multi_builder.rb                          | 101 +++++
 lib/rabl/partials.rb                               | 110 +-----
 lib/rabl/railtie.rb                                |   2 -
 lib/rabl/renderer.rb                               | 100 ++---
 lib/rabl/sources.rb                                |  87 ++++
 lib/rabl/template.rb                               |   9 +-
 lib/rabl/version.rb                                |   2 +-
 metadata.yml                                       |  35 +-
 test/builder_test.rb                               | 168 ++++----
 test/engine_test.rb                                |  12 +-
 test/integration/rails3_2/posts_controller_test.rb |   2 +-
 test/integration/rails3_2/users_controller_test.rb |   4 +-
 test/integration/rails4/posts_controller_test.rb   |   2 +-
 test/integration/rails4/users_controller_test.rb   |   4 +-
 test/models/user.rb                                |   2 +-
 test/multi_builder_test.rb                         |  69 ++++
 30 files changed, 1034 insertions(+), 654 deletions(-)

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