[DRE-commits] [ruby-js-routes] 01/05: Merge tag 'upstream/1.2.4'

[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 4118d2d03b19e8b7cae18bd8224ce672d821104d
Merge: d71a3d1 151e559
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Sun Mar 6 12:22:28 2016 +0530

    Merge tag 'upstream/1.2.4'
    
    Upstream version 1.2.4
    
    # gpg: Signature made Sunday 06 March 2016 12:22:23 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                                       |   5 -
 Appraisals                                        |   5 -
 CHANGELOG.md                                      |  24 +++
 Readme.md                                         |  13 +-
 app/assets/javascripts/js-routes.js.erb           |   1 +
 gemfiles/rails_edge.gemfile                       |   8 -
 lib/js_routes.rb                                  | 107 +++++------
 lib/js_routes/engine.rb                           |  15 +-
 lib/js_routes/version.rb                          |   2 +-
 lib/routes.js                                     | 158 ++++++++++------
 lib/routes.js.coffee                              | 114 +++++++-----
 metadata.yml                                      | 209 ----------------------
 spec/js_routes/generated_javascript_spec.rb       |   4 +
 spec/js_routes/options_spec.rb                    |  66 +++++--
 spec/js_routes/rails_routes_compatibility_spec.rb |  21 ++-
 spec/js_routes/zzz_last_post_rails_init_spec.rb   |  12 +-
 spec/spec_helper.rb                               |  33 +++-
 17 files changed, 383 insertions(+), 414 deletions(-)

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