[DRE-commits] [ruby-compass-rails] 01/03: Merge tag 'upstream/2.0.0'

[Caitlin Matos]

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

cm-guest pushed a commit to branch master
in repository ruby-compass-rails.

commit 2f6c3649c43ffe2a312f2daa5cc0aeb3b6108165
Merge: 45fdc2b 8e3b6f2
Author: Caitlin Matos <caitlin.matos at zoho.com>
Date:   Fri Aug 29 11:31:09 2014 -0400

    Merge tag 'upstream/2.0.0'

 Appraisals                                         |   4 -
 README.md                                          |  29 ++---
 checksums.yaml.gz                                  | Bin 426 -> 270 bytes
 compass-rails.gemspec                              |   1 -
 gemfiles/rails3.gemfile                            |  22 ----
 lib/compass-rails.rb                               |  45 +++----
 lib/compass-rails/configuration.rb                 |  78 +++++++++++-
 lib/compass-rails/configuration/asset_pipeline.rb  |  51 --------
 lib/compass-rails/configuration/default.rb         |  75 ------------
 lib/compass-rails/patches/4_0.rb                   |  26 +++-
 lib/compass-rails/patches/sass_importer.rb         |  59 ++++-----
 lib/compass-rails/railties.rb                      |   2 -
 lib/compass-rails/railties/3_0.rb                  |  48 --------
 lib/compass-rails/railties/3_1.rb                  | 124 ++++++-------------
 lib/compass-rails/railties/4_0.rb                  | 132 +++++++--------------
 lib/compass-rails/version.rb                       |   2 +-
 metadata.yml                                       |  45 ++-----
 test/helpers/rails_helper.rb                       |  10 +-
 test/integrations/rails3_test.rb                   |  37 ------
 test/integrations/rails_31_test.rb                 |   7 +-
 test/integrations/rails_32_test.rb                 |   8 +-
 .../integrations/rails_32_without_pipeline_test.rb |  37 ------
 test/integrations/rails_40_test.rb                 |   4 +-
 test/test_helper.rb                                |   2 +-
 24 files changed, 269 insertions(+), 579 deletions(-)

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