[DRE-commits] [ruby-js-routes] 01/04: Merge tag 'upstream/1.3.0'

[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 416580c1d7eba5770bb372de6faed884eb3367c6
Merge: 380c1ca 2824484
Author: Sruthi Chandran <srud at disroot.org>
Date:   Fri Aug 26 15:56:42 2016 +0530

    Merge tag 'upstream/1.3.0'
    
    Upstream version 1.3.0

 .travis.yml                                       | 19 +++++-
 Appraisals                                        |  2 +-
 CHANGELOG.md                                      | 29 +++++++++
 Guardfile                                         |  3 -
 Rakefile                                          | 15 ++++-
 Readme.md                                         | 35 +++++++++--
 app/assets/javascripts/js-routes.js.erb           |  1 -
 gemfiles/rails50.gemfile                          |  8 +++
 gemfiles/rails50_sprockets3.gemfile               |  8 +++
 js-routes.gemspec                                 |  7 +--
 lib/js_routes.rb                                  | 38 +++++++-----
 lib/js_routes/engine.rb                           | 75 +++++++++++++++++++----
 lib/js_routes/version.rb                          |  2 +-
 lib/routes.js                                     | 39 +++++++++---
 lib/routes.js.coffee                              | 27 +++++---
 spec/js_routes/generated_javascript_spec.rb       |  4 --
 spec/js_routes/options_spec.rb                    | 34 ++++++----
 spec/js_routes/rails_routes_compatibility_spec.rb | 45 +++++++++++---
 spec/spec_helper.rb                               | 75 +++--------------------
 spec/support/routes.rb                            | 71 +++++++++++++++++++++
 temp                                              |  2 -
 21 files changed, 386 insertions(+), 153 deletions(-)

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