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

[Balasankar C]

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

balasankarc-guest pushed a commit to branch master
in repository ruby-haml-rails.

commit c28d1c5f0fe443fc5fc92c7de8f578d9e72d4d27
Merge: c50cd07 5a4ffe4
Author: Balasankar C <balasankarc at autistici.org>
Date:   Tue Jan 20 22:48:39 2015 +0530

    Merge tag 'upstream/0.7.0'
    
    Upstream version 0.7.0

 .travis.yml                                        | 14 +++++-----
 Appraisals                                         | 16 ++++++-----
 Gemfile                                            |  4 +++
 README.md                                          | 22 ++++++++++++++-
 gemfiles/rails_3_1.gemfile                         |  7 -----
 gemfiles/rails_3_2.gemfile                         |  7 -----
 gemfiles/rails_4_0.gemfile                         |  5 +++-
 gemfiles/rails_4_1.gemfile                         | 10 +++++++
 haml-rails.gemspec                                 |  3 ++-
 .../haml/scaffold/templates/index.html.haml        | 26 +++++++++---------
 lib/haml-rails.rb                                  | 11 ++++++++
 lib/haml-rails/version.rb                          |  2 +-
 .../application_layout_generator.rb                | 31 ++++++++++++++++++++++
 metadata.yml                                       | 26 +++++++++++++-----
 test/test_helper.rb                                |  2 +-
 15 files changed, 134 insertions(+), 52 deletions(-)

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