[DRE-commits] [ruby-js-routes] 01/03: Merge tag 'upstream/1.3.3'

[Sruthi Chandran]

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

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

commit ed001e3a797ea79bd6701d550f8b9d32f9686f68
Merge: 5e1861a 9919cf4
Author: Sruthi Chandran <srud at disroot.org>
Date:   Tue Jun 27 20:33:14 2017 +0530

    Merge tag 'upstream/1.3.3'
    
    Upstream version 1.3.3
    
    # gpg: Signature made Tue 27 Jun 2017 08:33:13 PM IST
    # gpg:                using RSA key B1C94F67189FFAC02648FBF3D4DEB22FC0B96E15
    # gpg: Good signature from "Sruthi Chandran <srud at openmailbox.org>" [unknown]
    # gpg:                 aka "Srud <angelsrud at gmail.com>" [unknown]
    # gpg:                 aka "Srud <srud at openmailbox.org>" [unknown]
    # gpg:                 aka "Sruthi Chandran <srud at disroot.org>" [unknown]
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: F889 1B55 2BAD DE5D 0936  8B47 C9B0 AC74 C72B 5836
    #      Subkey fingerprint: B1C9 4F67 189F FAC0 2648  FBF3 D4DE B22F C0B9 6E15

 CHANGELOG.md                                      |  4 ++
 Readme.md                                         |  8 ++-
 gemfiles/rails42.gemfile                          |  1 +
 gemfiles/rails42_sprockets3.gemfile               |  1 +
 js-routes.gemspec                                 |  1 +
 lib/js_routes.rb                                  | 43 +++++++----
 lib/js_routes/engine.rb                           | 42 ++++++-----
 lib/js_routes/version.rb                          |  2 +-
 lib/routes.js                                     | 59 +++++++++++----
 lib/routes.js.coffee                              | 46 +++++++++---
 spec/js_routes/generated_javascript_spec.rb       |  8 +--
 spec/js_routes/options_spec.rb                    |  8 +++
 spec/js_routes/rails_routes_compatibility_spec.rb | 88 ++++++++++++++++++++---
 spec/spec_helper.rb                               |  1 -
 spec/support/routes.rb                            |  7 +-
 15 files changed, 245 insertions(+), 74 deletions(-)

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