[DRE-commits] [ruby-js-routes] 01/02: Merge tag 'upstream/1.1.2'

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-js-routes.

commit 05851348b72728d01e5134f5443260774ed9db50
Merge: 46a2bda 01f4169
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Oct 25 23:15:56 2015 +0530

    Merge tag 'upstream/1.1.2'
    
    Upstream version 1.1.2
    
    # gpg: Signature made Sunday 25 October 2015 11:15:49 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                                        |  9 +-
 Appraisals                                         |  7 +-
 CHANGELOG.md                                       | 17 ++++
 Readme.md                                          |  6 +-
 gemfiles/rails42.gemfile                           |  2 +-
 gemfiles/rails42_sprockets3.gemfile                |  2 +-
 ...ils42_sprockets3.gemfile => rails_edge.gemfile} |  2 +-
 js-routes.gemspec                                  |  3 +
 lib/js_routes.rb                                   | 19 +++--
 lib/js_routes/engine.rb                            |  2 +-
 lib/js_routes/version.rb                           |  2 +-
 lib/routes.js                                      | 96 +++++++++++-----------
 lib/routes.js.coffee                               | 40 ++++++---
 metadata.yml                                       | 20 ++++-
 spec/js_routes/default_serializer_spec.rb          | 13 +++
 spec/js_routes/generated_javascript_spec.rb        | 12 +++
 spec/js_routes/options_spec.rb                     | 36 ++++++--
 spec/js_routes/rails_routes_compatibility_spec.rb  | 59 +++----------
 spec/spec_helper.rb                                |  6 +-
 19 files changed, 219 insertions(+), 134 deletions(-)

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