[DRE-commits] [ruby-compass-rails] 01/05: Merge tag 'upstream/2.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-compass-rails.

commit 2711f24ca1a6f0504e55734185ee50b99da830eb
Merge: 6c947a2 4039997
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Wed Apr 1 22:09:52 2015 +0530

    Merge tag 'upstream/2.0.4'
    
    Upstream version 2.0.4
    
    # gpg: Signature made Wednesday 01 April 2015 10:09:42 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>"

 .gitignore                                         |   1 +
 .travis.yml                                        |  23 +++-
 Appraisals                                         |   5 +
 CHANGELOG.md                                       |  71 ++++++++++++
 Gemfile                                            |  10 +-
 README.md                                          |  14 +--
 Rakefile                                           |  15 +--
 changelog.markdown                                 |  11 --
 checksums.yaml.gz                                  | Bin 270 -> 0 bytes
 compass-rails.gemspec                              |   5 +-
 gemfiles/rails31.gemfile                           |  13 +--
 gemfiles/rails32.gemfile                           |  13 +--
 gemfiles/rails40.gemfile                           |  13 +--
 gemfiles/rails42.gemfile                           |  22 ++++
 lib/compass-rails.rb                               | 121 +--------------------
 lib/compass-rails/installer.rb                     |  30 -----
 lib/compass-rails/patches.rb                       |   3 -
 lib/compass-rails/patches/3_1.rb                   |  15 +--
 lib/compass-rails/patches/4_0.rb                   |  50 ++++-----
 lib/compass-rails/patches/compass.rb               |   2 +-
 lib/compass-rails/patches/importer.rb              |  22 ++--
 lib/compass-rails/patches/sass_importer.rb         |  58 +++++++++-
 lib/compass-rails/patches/sprite_importer.rb       |   6 +-
 lib/compass-rails/railties/3_1.rb                  |  13 +--
 lib/compass-rails/railties/4_0.rb                  |   9 +-
 lib/compass-rails/version.rb                       |   2 +-
 metadata.yml                                       |  70 +++++++++---
 test/compass_rails_spec.rb                         |  39 +++++++
 test/fixtures/assets/images/letters/a.png          | Bin 0 -> 719 bytes
 test/fixtures/assets/images/letters/b.png          | Bin 0 -> 680 bytes
 test/fixtures/assets/images/numbers/sprite-1.png   | Bin 0 -> 293 bytes
 test/fixtures/assets/images/numbers/sprite-2.png   | Bin 0 -> 317 bytes
 .../assets/stylesheets/application.css.scss        |  23 ++++
 .../assets/stylesheets/partials/_partial_1.scss    |   3 +
 .../assets/stylesheets/partials/_partial_2.scss    |   3 +
 test/helpers/command_helper.rb                     |  17 +--
 test/helpers/debug_helper.rb                       |   2 +-
 test/helpers/file_helper.rb                        |  19 +---
 test/helpers/rails_helper.rb                       |  66 +++++------
 test/helpers/rails_project.rb                      |  96 +++++-----------
 test/integrations/.gitkeep                         |   0
 test/integrations/rails_31_test.rb                 |  46 --------
 test/integrations/rails_32_test.rb                 |  46 --------
 test/integrations/rails_40_test.rb                 |  46 --------
 test/test_helper.rb                                |  11 +-
 test/units/.gitkeep                                |   0
 46 files changed, 445 insertions(+), 589 deletions(-)

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