[DRE-commits] [ruby-backbone-on-rails] 01/04: Merge tag 'upstream/1.2.0.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-backbone-on-rails.

commit 24a090510e26732e4165278a01abb6c93c4375cd
Merge: b6650a6 279f263
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Sep 2 12:33:30 2015 +0530

    Merge tag 'upstream/1.2.0.0'
    
    Upstream version 1.2.0.0
    
    # gpg: Signature made Wednesday 02 September 2015 12:33:22 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                                        |   2 +-
 CHANGELOG                                          |  11 +
 README                                             |  92 --
 README.md                                          | 103 +++
 backbone-on-rails.gemspec                          |   8 +-
 lib/backbone-on-rails/version.rb                   |   2 +-
 lib/generators/backbone/helpers.rb                 |  12 +-
 .../backbone/install/install_generator.rb          |  18 +-
 .../backbone/scaffold/scaffold_generator.rb        |  46 +-
 .../backbone/scaffold/templates/template.hbs       |   0
 lib/generators/backbone/scaffold/templates/view.js |   2 +-
 .../backbone/scaffold/templates/view.js.coffee     |   2 +-
 metadata.yml                                       | 109 +--
 test/backbone-on-rails_test.rb                     |   4 +-
 test/generators/install_generator_test.rb          |  17 +
 test/generators/scaffold_generator_test.rb         |  86 ++
 vendor/assets/javascripts/backbone.js              | 922 +++++++++++++--------
 vendor/assets/javascripts/underscore.js            | 746 ++++++++++-------
 18 files changed, 1357 insertions(+), 825 deletions(-)

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