[DRE-commits] [ruby-jquery-rails] 01/03: Merge tag 'upstream/4.0.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-jquery-rails.

commit bd2f4a5435aed64e9b525a57c99afb294edfa8ed
Merge: f8d2da8 32dbba3
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Mon Jul 13 22:36:21 2015 +0530

    Merge tag 'upstream/4.0.4'
    
    Upstream version 4.0.4
    
    # gpg: Signature made Monday 13 July 2015 10:36:17 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>"

 CHANGELOG.md                                       |   14 +
 README.md                                          |   52 +-
 Rakefile                                           |   39 +-
 VERSIONS.md                                        |    5 +
 jquery-rails.gemspec                               |    8 +-
 lib/generators/jquery/install/install_generator.rb |   50 -
 lib/jquery/assert_select.rb                        |  171 +-
 lib/jquery/rails.rb                                |    4 +-
 lib/jquery/rails/railtie.rb                        |   18 -
 lib/jquery/rails/version.rb                        |    7 +-
 metadata.yml                                       |   39 +-
 vendor/assets/javascripts/jquery.js                |  188 +-
 vendor/assets/javascripts/jquery.min.js            |    9 +-
 vendor/assets/javascripts/jquery.min.map           |    2 +-
 .../assets/javascripts/{jquery.js => jquery2.js}   | 4229 ++++++++------------
 vendor/assets/javascripts/jquery2.min.js           |    4 +
 vendor/assets/javascripts/jquery2.min.map          |    1 +
 vendor/assets/javascripts/jquery_ujs.js            |   60 +-
 18 files changed, 1905 insertions(+), 2995 deletions(-)

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