[DRE-commits] [ruby-slim] 03/07: Merge tag 'upstream/2.0.1'

[Jérémy Bobbio]

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

lunar pushed a commit to branch master
in repository ruby-slim.

commit 538fa261d75f08d0270172d55270ff2513dffb33
Merge: 17b1d47 3a3b962
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Thu Aug 8 14:10:38 2013 +0200

    Merge tag 'upstream/2.0.1'
    
    Upstream version 2.0.1

 .travis.yml                        |    9 +--
 .yardopts                          |    3 +-
 CHANGES                            |    9 +++
 Gemfile                            |    1 +
 README.md                          |  118 +++++++++++++++++++-----------------
 Rakefile                           |    1 +
 checksums.yaml.gz                  |  Bin 268 -> 270 bytes
 doc/logic_less.md                  |   13 ++--
 doc/translator.md                  |   13 ++--
 lib/slim/code_attributes.rb        |    6 +-
 lib/slim/command.rb                |    2 +-
 lib/slim/do_inserter.rb            |    2 +-
 lib/slim/embedded.rb               |    1 +
 lib/slim/engine.rb                 |    1 -
 lib/slim/parser.rb                 |   11 ++--
 lib/slim/splat/builder.rb          |    2 +-
 lib/slim/splat/filter.rb           |   11 ++--
 lib/slim/version.rb                |    2 +-
 metadata.yml                       |   23 +++----
 slim.gemspec                       |   11 ++--
 test/core/helper.rb                |    6 +-
 test/core/test_code_escaping.rb    |   29 +++++++++
 test/core/test_code_structure.rb   |   23 ++++++-
 test/core/test_embedded_engines.rb |   14 ++++-
 test/core/test_html_attributes.rb  |   15 ++++-
 test/core/test_parser_errors.rb    |   14 +++++
 test/literate/TESTS.md             |   40 +++++++++++-
 test/logic_less/test_logic_less.rb |    2 +-
 28 files changed, 261 insertions(+), 121 deletions(-)

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