[DRE-commits] [ruby-haml] 01/03: Merge tag 'upstream/4.0.5'

[Gunnar Wolf]

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

gwolf pushed a commit to branch master
in repository ruby-haml.

commit e4a0e52ed47c0c8ff6a259b5332ab52920474399
Merge: 97add76 1af8982
Author: Gunnar Wolf <gwolf at debian.org>
Date:   Fri Jan 31 10:07:54 2014 -0600

    Merge tag 'upstream/4.0.5'
    
    Upstream version 4.0.5
    
    # gpg: Signature made Fri 31 Jan 2014 10:07:50 AM CST using RSA key ID C1DB921F
    # gpg: Good signature from "Gunnar Eyal Wolf Iszaevich <gwolf at debian.org>"
    # gpg:                 aka "Gunnar Eyal Wolf Iszaevich <gwolf at gwolf.org>"
    # gpg:                 aka "Gunnar Eyal Wolf Iszaevich (Instituto de Investigaciones Económicas UNAM) <gwolf at iiec.unam.mx>"

 CHANGELOG.md                               |  22 +++++++
 REFERENCE.md                               |   9 ++-
 checksums.yaml.gz                          | Bin 269 -> 270 bytes
 lib/haml.rb                                |   2 +-
 lib/haml/helpers.rb                        |  43 +++++++------
 lib/haml/helpers/action_view_extensions.rb |   2 +-
 lib/haml/helpers/action_view_mods.rb       |  15 ++---
 lib/haml/options.rb                        |   4 +-
 lib/haml/parser.rb                         |   3 +-
 lib/haml/temple.rb                         |  85 +++++++++++++++++++++++++
 lib/haml/version.rb                        |   2 +-
 metadata.yml                               |  58 ++++++++---------
 test/engine_test.rb                        |  14 +++++
 test/gemfiles/Gemfile.rails-3.2.x.lock     |  98 -----------------------------
 test/helper_test.rb                        |  39 ++++++++++++
 test/results/partial_layout_erb.xhtml      |   2 +-
 test/template_test.rb                      |  23 +++++++
 test/templates/partial_layout_erb.erb      |   2 +-
 18 files changed, 258 insertions(+), 165 deletions(-)

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