[DRE-commits] [ruby-sprockets-rails] 02/04: Merge tag 'upstream/2.1.3'

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository ruby-sprockets-rails.

commit 291c857ff78b5392d6f3706abf5bed8935803faf
Merge: daeb6ae 9c2b5cd
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jul 26 16:28:08 2014 -0300

    Merge tag 'upstream/2.1.3'
    
    Upstream version 2.1.3
    
    # gpg: Signature made Sáb 26 Jul 2014 16:28:05 BRT using RSA key ID CD460BDE
    # gpg: Good signature from "Antonio Terceiro <terceiro at softwarelivre.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at dcc.ufba.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at colivre.coop.br>"
    # gpg:                 aka "Antonio Terceiro <terceiro at debian.org>"
    # gpg:                 aka "Antonio Terceiro <antonio.terceiro at linaro.org>"
    # gpg:                 aka "Antonio Terceiro <terceiro at cs.ubc.ca>"

 .gitignore                                     |   3 -
 .travis.yml                                    |  12 -
 CHANGELOG.md                                   |  16 --
 Gemfile                                        |   6 -
 LICENSE                                        |   2 +-
 README.md                                      |  18 +-
 Rakefile                                       |   9 -
 checksums.yaml.gz                              | Bin 0 -> 269 bytes
 lib/sprockets/rails.rb                         |   1 +
 lib/sprockets/rails/helper.rb                  |  72 ++++-
 lib/sprockets/rails/legacy_asset_url_helper.rb |   3 +-
 lib/sprockets/rails/task.rb                    |   1 +
 lib/sprockets/rails/version.rb                 |   5 +
 lib/sprockets/railtie.rb                       |  23 +-
 metadata.yml                                   | 122 ++++++++
 sprockets-rails.gemspec                        |  18 --
 test/fixtures/bar.css                          |   1 -
 test/fixtures/bar.js                           |   1 -
 test/fixtures/dependency.css                   |   1 -
 test/fixtures/dependency.js                    |   1 -
 test/fixtures/file1.css                        |   2 -
 test/fixtures/file1.js                         |   1 -
 test/fixtures/file2.css                        |   2 -
 test/fixtures/file2.js                         |   1 -
 test/fixtures/foo.css                          |   1 -
 test/fixtures/foo.js                           |   1 -
 test/fixtures/url.css.erb                      |   1 -
 test/fixtures/url.js.erb                       |   1 -
 test/gemfiles/Gemfile.rails-3.0.x              |   5 -
 test/gemfiles/Gemfile.rails-3.1.x              |   7 -
 test/gemfiles/Gemfile.rails-3.2.x              |   7 -
 test/gemfiles/Gemfile.rails-4.0.x              |   5 -
 test/test_helper.rb                            | 383 -------------------------
 test/test_railtie.rb                           | 165 -----------
 test/test_task.rb                              | 114 --------
 35 files changed, 236 insertions(+), 775 deletions(-)

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