[DRE-commits] [ruby-liquid] 01/03: Merge tag 'upstream/2.6.0'

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

commit 8d04f59a9126757ca042b336d235f3a86aa97e55
Merge: 0423edf 59981ba
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Dec 9 17:18:23 2013 +0100

    Merge tag 'upstream/2.6.0'
    
    Upstream version 2.6.0
    
    # gpg: Signature faite le lun. 09 déc. 2013 17:18:17 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> »

 History.md                           |  32 +++++++++++++-
 MIT-LICENSE                          |   2 +-
 README.md                            |   6 +++
 checksums.yaml.gz                    | Bin 421 -> 425 bytes
 lib/extras/liquid_view.rb            |  18 ++++----
 lib/liquid.rb                        |   1 +
 lib/liquid/block.rb                  |  21 ++++++---
 lib/liquid/context.rb                |  26 +++++++----
 lib/liquid/document.rb               |   2 +-
 lib/liquid/errors.rb                 |   3 +-
 lib/liquid/file_system.rb            |  24 +++++------
 lib/liquid/htmltags.rb               |   2 +-
 lib/liquid/module_ex.rb              |   2 +-
 lib/liquid/standardfilters.rb        |  70 +++++++++++++++++++-----------
 lib/liquid/strainer.rb               |   6 +--
 lib/liquid/tag.rb                    |   2 +-
 lib/liquid/tags/assign.rb            |  26 +++++------
 lib/liquid/tags/break.rb             |   4 +-
 lib/liquid/tags/capture.rb           |   1 +
 lib/liquid/tags/case.rb              |  56 ++++++++++++------------
 lib/liquid/tags/continue.rb          |   2 +-
 lib/liquid/tags/cycle.rb             |  42 +++++++++---------
 lib/liquid/tags/decrement.rb         |  14 +++---
 lib/liquid/tags/for.rb               |  52 +++++++++++-----------
 lib/liquid/tags/ifchanged.rb         |  18 ++++----
 lib/liquid/tags/include.rb           |  56 ++++++++++++++++++------
 lib/liquid/tags/increment.rb         |  14 +++---
 lib/liquid/tags/raw.rb               |   9 ++--
 lib/liquid/tags/unless.rb            |  16 +++----
 lib/liquid/template.rb               |  16 ++++---
 lib/liquid/utils.rb                  |   1 -
 lib/liquid/variable.rb               |   4 +-
 lib/liquid/version.rb                |   4 ++
 metadata.yml                         |  12 ++++--
 test/liquid/assign_test.rb           |   2 +-
 test/liquid/condition_test.rb        |   2 +-
 test/liquid/hash_ordering_test.rb    |  25 +++++++++++
 test/liquid/output_test.rb           |   4 +-
 test/liquid/standard_filter_test.rb  |  24 +++++++++--
 test/liquid/tags/for_tag_test.rb     |  81 ++++++++++++++++++++---------------
 test/liquid/tags/html_tag_test.rb    |   4 +-
 test/liquid/tags/include_tag_test.rb |  29 ++++++++++++-
 test/liquid/tags/raw_tag_test.rb     |  13 +++++-
 test/liquid/template_test.rb         |  72 +++++++++++++++++++++++++++++++
 test/liquid/variable_test.rb         |   6 +++
 45 files changed, 560 insertions(+), 266 deletions(-)

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