[DRE-commits] [ruby-coffee-rails] 01/10: Merge tag 'upstream/4.1.0'

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-coffee-rails.

commit 81b6e67e7503c8c058d849a3b2abee8d812f697d
Merge: c63d6fd e34a01d
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Tue Jul 28 20:14:05 2015 +0530

    Merge tag 'upstream/4.1.0'
    
    Upstream version 4.1.0
    
    # gpg: Signature made Tuesday 28 July 2015 08:14:00 PM IST using RSA key ID 4512C22A
    # gpg: Good signature from "Praveen Arimbrathodiyil (piratepin) <praveen at debian.org>"
    # gpg:                 aka "Pirate Praveen (pirates.org.in) <praveen at onenetbeyond.org>"
    # gpg:                 aka "Pirate Praveen (piratesin) <me at j4v4m4n.in>"
    # gpg:                 aka "Pirate Praveen (PP) <praveen at privacyrequired.com>"
    # gpg:                 aka "Praveen Arimbrathodiyil (j4v4m4n) <pravi.a at gmail.com>"

 .travis.yml                                        |   6 ++--
 CHANGELOG.md                                       |  10 +++++++
 Gemfile                                            |   6 ++--
 checksums.yaml.gz                                  | Bin 269 -> 0 bytes
 coffee-rails.gemspec                               |   4 +--
 gemfiles/Gemfile-4-0-stable                        |   6 ++++
 gemfiles/Gemfile-4-1-stable                        |  11 +++++++
 lib/coffee/rails/engine.rb                         |   4 +++
 lib/coffee/rails/version.rb                        |   2 +-
 .../generators/coffee/assets/assets_generator.rb   |   2 +-
 .../{javascript.js.coffee => javascript.coffee}    |   0
 metadata.yml                                       |  33 +++++++++++----------
 test/assets_generator_test.rb                      |   2 +-
 test/controller_generator_test.rb                  |   2 +-
 test/scaffold_generator_test.rb                    |   2 +-
 .../support/site/{index.js.coffee => index.coffee} |   0
 16 files changed, 63 insertions(+), 27 deletions(-)

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