[DRE-commits] [ruby-haml-rails] 01/02: Merge tag 'upstream/0.9.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 384fa867c7fc193b42a3bb045a47e7302a77eccd
Merge: 7f026cf 450ae36
Author: Balasankar C <balasankarc at autistici.org>
Date:   Tue Mar 24 17:05:08 2015 +0530

    Merge tag 'upstream/0.9.0'
    
    Upstream version 0.9.0

 .travis.yml                                        |  3 +
 Appraisals                                         | 10 ++--
 LICENSE                                            |  2 +-
 README.md                                          |  5 +-
 Rakefile                                           |  6 +-
 gemfiles/rails_4_0.gemfile                         |  8 +--
 gemfiles/rails_4_1.gemfile                         | 10 ++--
 gemfiles/rails_4_2.gemfile                         | 10 ++++
 haml-rails.gemspec                                 |  6 +-
 lib/generators/haml/mailer/mailer_generator.rb     | 26 +++++++-
 .../haml/mailer/templates/layout.html.haml         |  3 +
 .../haml/mailer/templates/layout.text.haml         |  1 +
 .../haml/mailer/templates/view.html.haml           |  4 ++
 .../haml/scaffold/templates/index.html.haml        |  2 +-
 lib/haml-rails.rb                                  |  9 +--
 lib/haml-rails/version.rb                          |  2 +-
 metadata.yml                                       | 70 ++++++++++++----------
 .../generators/haml/controller_generator_test.rb   | 15 ++---
 test/lib/generators/haml/mailer_generator_test.rb  | 19 ++++++
 test/test_helper.rb                                |  8 +--
 20 files changed, 137 insertions(+), 82 deletions(-)

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