[DRE-commits] [ruby-sass-rails] 01/03: Merge tag 'upstream/5.0.6'

[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-sass-rails.

commit b56d730d1ae18666e9d0f95f9196d7d0fa3c9e99
Merge: 1d5c161 4da1652
Author: Sruthi Chandran <srud at disroot.org>
Date:   Tue Sep 6 23:02:53 2016 +0530

    Merge tag 'upstream/5.0.6'
    
    Upstream version 5.0.6

 .travis.yml                                        | 20 +++++++++++++++--
 gemfiles/Gemfile-rails-4-0                         |  3 +++
 gemfiles/Gemfile-rails-4-1                         |  3 +++
 gemfiles/Gemfile-rails-4-2                         |  3 +++
 gemfiles/Gemfile-rails-5-0                         |  7 ++++++
 gemfiles/Gemfile-sass-3-1                          |  2 ++
 gemfiles/Gemfile-sass-3-2                          |  2 ++
 gemfiles/Gemfile-sass-3-3                          |  2 ++
 gemfiles/Gemfile-sass-3-4                          |  2 ++
 gemfiles/Gemfile-sprockets-2-11                    |  3 +++
 gemfiles/Gemfile-sprockets-2-12                    |  3 +++
 gemfiles/Gemfile-sprockets-2-8                     |  3 +++
 gemfiles/Gemfile-sprockets-3-0                     |  3 +++
 gemfiles/Gemfile-sprockets-4-0                     |  9 ++++++++
 gemfiles/Gemfile-sprockets-rails-2-2               |  3 +++
 gemfiles/Gemfile-sprockets-rails-master            |  3 +++
 lib/sass/rails/railtie.rb                          | 18 +++++++++++++--
 lib/sass/rails/version.rb                          |  2 +-
 sass-rails.gemspec                                 |  2 +-
 .../app/assets/config/manifest.js                  |  3 +++
 .../config/environments/production.rb              |  4 +++-
 .../config/environments/test.rb                    | 10 +++++++--
 .../fixtures/engine_project/engine_project.gemspec | 12 +++++-----
 .../test/dummy/config/environments/production.rb   |  4 +++-
 .../test/dummy/config/environments/test.rb         | 10 +++++++--
 .../sass_project/app/assets/config/manifest.js     |  3 +++
 .../sass_project/config/environments/production.rb |  4 +++-
 .../sass_project/config/environments/test.rb       | 10 +++++++--
 .../scss_project/app/assets/config/manifest.js     |  3 +++
 .../scss_project/config/environments/production.rb |  4 +++-
 .../scss_project/config/environments/test.rb       | 10 +++++++--
 .../config/initializers/postprocessor.rb           | 26 +++++++++++++++++++---
 test/sass_rails_test.rb                            |  4 ++--
 33 files changed, 171 insertions(+), 29 deletions(-)

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