[DRE-commits] [ruby-sass-rails] 02/05: Merge tag 'upstream/5.0.3'
Antonio Terceiro
terceiro at moszumanska.debian.org
Fri Aug 14 12:30:53 UTC 2015
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository ruby-sass-rails.
commit 2d1518223c0591b9e8037efb6fc9c62a3e9f4abd
Merge: 129f0e9 bdc5efb
Author: Antonio Terceiro <terceiro at debian.org>
Date: Fri Aug 14 09:25:48 2015 -0300
Merge tag 'upstream/5.0.3'
Upstream version 5.0.3
# gpg: Signature made Sex 14 Ago 2015 09:25:46 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>"
.gitignore | 7 +
.travis.yml | 49 ++++
CHANGELOG.md | 69 ------
Gemfile | 7 +
README.md | 6 +-
Rakefile | 14 ++
gemfiles/Gemfile-rails-4-0 | 6 +
gemfiles/Gemfile-rails-4-1 | 6 +
gemfiles/Gemfile-rails-4-2 | 6 +
gemfiles/Gemfile-sass-3-1 | 7 +
gemfiles/Gemfile-sass-3-2 | 7 +
gemfiles/Gemfile-sass-3-3 | 7 +
gemfiles/Gemfile-sass-3-4 | 7 +
gemfiles/Gemfile-sprockets-2-11 | 7 +
gemfiles/Gemfile-sprockets-2-12 | 7 +
gemfiles/Gemfile-sprockets-2-8 | 7 +
gemfiles/Gemfile-sprockets-3-0 | 7 +
gemfiles/Gemfile-sprockets-rails-2-2 | 7 +
gemfiles/Gemfile-sprockets-rails-master | 7 +
lib/sass/rails/helpers.rb | 1 +
lib/sass/rails/logger.rb | 1 +
lib/sass/rails/railtie.rb | 9 +-
lib/sass/rails/version.rb | 2 +-
metadata.yml | 181 --------------
sass-rails.gemspec | 26 ++
test/fixtures/alternate_config_project/.gitignore | 5 +
test/fixtures/alternate_config_project/Gemfile | 7 +
test/fixtures/alternate_config_project/README | 261 +++++++++++++++++++++
test/fixtures/alternate_config_project/Rakefile | 7 +
.../app/assets/images/1x1.png | Bin 0 -> 926 bytes
.../app/assets/images/rails.png | Bin 0 -> 6646 bytes
.../app/assets/javascripts/application.js | 9 +
.../app/assets/stylesheets/_top_level_partial.scss | 3 +
.../app/assets/stylesheets/application.scss | 32 +++
.../app/assets/stylesheets/css_application.css | 11 +
.../app/assets/stylesheets/globbed/globbed.scss | 3 +
.../stylesheets/globbed/nested/nested_glob.scss | 3 +
.../assets/stylesheets/partials/_sass_import.sass | 5 +
.../assets/stylesheets/partials/_scss_import.scss | 9 +
.../stylesheets/partials/_without_css_ext.scss | 3 +
.../partials/subfolder/_relative_sass.sass | 2 +
.../partials/subfolder/_relative_scss.scss | 3 +
.../partials/subfolder/relative_not_a_partial.scss | 3 +
.../assets/stylesheets/subfolder/another_plain.css | 3 +
.../app/assets/stylesheets/subfolder/plain.css | 3 +
.../assets/stylesheets/subfolder/second_level.scss | 1 +
.../app/controllers/application_controller.rb | 3 +
.../app/helpers/application_helper.rb | 2 +
.../alternate_config_project/app/mailers/.gitkeep | 0
.../alternate_config_project/app/models/.gitkeep | 0
.../app/views/layouts/application.html.erb | 14 ++
test/fixtures/alternate_config_project/config.ru | 4 +
.../alternate_config_project/config/application.rb | 49 ++++
.../alternate_config_project/config/boot.rb | 6 +
.../alternate_config_project/config/database.yml | 25 ++
.../alternate_config_project/config/environment.rb | 5 +
.../config/environments/development.rb | 27 +++
.../config/environments/production.rb | 60 +++++
.../config/environments/test.rb | 42 ++++
.../config/initializers/backtrace_silencers.rb | 7 +
.../config/initializers/inflections.rb | 10 +
.../config/initializers/mime_types.rb | 5 +
.../config/initializers/secret_token.rb | 7 +
.../config/initializers/session_store.rb | 8 +
.../config/initializers/wrap_parameters.rb | 12 +
.../alternate_config_project/config/locales/en.yml | 5 +
.../alternate_config_project/config/routes.rb | 58 +++++
test/fixtures/alternate_config_project/db/seeds.rb | 7 +
.../alternate_config_project/doc/README_FOR_APP | 2 +
.../alternate_config_project/lib/tasks/.gitkeep | 0
.../fixtures/alternate_config_project/log/.gitkeep | 0
.../alternate_config_project/public/404.html | 26 ++
.../alternate_config_project/public/422.html | 26 ++
.../alternate_config_project/public/500.html | 26 ++
.../alternate_config_project/public/favicon.ico | 0
.../alternate_config_project/public/index.html | 241 +++++++++++++++++++
.../alternate_config_project/public/robots.txt | 5 +
.../fixtures/alternate_config_project/script/rails | 6 +
.../vendor/assets/stylesheets/.gitkeep | 0
.../vendor/plugins/.gitkeep | 0
test/fixtures/engine_project/.gitignore | 8 +
test/fixtures/engine_project/Gemfile | 14 ++
test/fixtures/engine_project/MIT-LICENSE | 20 ++
test/fixtures/engine_project/README.rdoc | 3 +
test/fixtures/engine_project/Rakefile | 34 +++
.../app/assets/images/engine_project/.keep | 0
.../javascripts/engine_project/application.js | 16 ++
.../stylesheets/engine_project/application.css | 13 +
.../engine_project/application_controller.rb | 4 +
.../helpers/engine_project/application_helper.rb | 4 +
.../layouts/engine_project/application.html.erb | 14 ++
test/fixtures/engine_project/config/routes.rb | 2 +
.../fixtures/engine_project/engine_project.gemspec | 23 ++
test/fixtures/engine_project/lib/engine_project.rb | 4 +
.../engine_project/lib/engine_project/engine.rb | 5 +
.../engine_project/lib/engine_project/version.rb | 3 +
.../lib/tasks/engine_project_tasks.rake | 4 +
test/fixtures/engine_project/script/rails | 8 +
.../fixtures/engine_project/test/dummy/README.rdoc | 28 +++
test/fixtures/engine_project/test/dummy/Rakefile | 6 +
.../dummy/app/assets/javascripts/application.js | 16 ++
.../dummy/app/assets/stylesheets/application.css | 13 +
.../app/controllers/application_controller.rb | 5 +
.../test/dummy/app/controllers/concerns/.keep | 0
.../test/dummy/app/helpers/application_helper.rb | 2 +
.../engine_project/test/dummy/app/mailers/.keep | 0
.../engine_project/test/dummy/app/models/.keep | 0
.../test/dummy/app/models/concerns/.keep | 0
.../dummy/app/views/layouts/application.html.erb | 14 ++
test/fixtures/engine_project/test/dummy/bin/bundle | 3 +
test/fixtures/engine_project/test/dummy/bin/rails | 4 +
test/fixtures/engine_project/test/dummy/bin/rake | 4 +
test/fixtures/engine_project/test/dummy/config.ru | 4 +
.../test/dummy/config/application.rb | 23 ++
.../engine_project/test/dummy/config/boot.rb | 9 +
.../engine_project/test/dummy/config/database.yml | 25 ++
.../test/dummy/config/environment.rb | 5 +
.../test/dummy/config/environments/development.rb | 27 +++
.../test/dummy/config/environments/production.rb | 84 +++++++
.../test/dummy/config/environments/test.rb | 40 ++++
.../config/initializers/backtrace_silencers.rb | 7 +
.../initializers/filter_parameter_logging.rb | 4 +
.../test/dummy/config/initializers/inflections.rb | 16 ++
.../test/dummy/config/initializers/mime_types.rb | 5 +
.../test/dummy/config/initializers/secret_token.rb | 12 +
.../dummy/config/initializers/session_store.rb | 3 +
.../dummy/config/initializers/wrap_parameters.rb | 14 ++
.../test/dummy/config/locales/en.yml | 23 ++
.../engine_project/test/dummy/config/routes.rb | 4 +
.../engine_project/test/dummy/lib/assets/.keep | 0
test/fixtures/engine_project/test/dummy/log/.keep | 0
.../engine_project/test/dummy/public/404.html | 27 +++
.../engine_project/test/dummy/public/422.html | 26 ++
.../engine_project/test/dummy/public/500.html | 26 ++
.../engine_project/test/dummy/public/favicon.ico | 0
test/fixtures/sass_project/.gitignore | 5 +
test/fixtures/sass_project/Gemfile | 7 +
test/fixtures/sass_project/README | 261 +++++++++++++++++++++
test/fixtures/sass_project/Rakefile | 7 +
.../sass_project/app/assets/images/rails.png | Bin 0 -> 6646 bytes
.../app/assets/javascripts/application.js | 9 +
.../app/assets/stylesheets/application.css | 7 +
.../app/controllers/application_controller.rb | 3 +
.../sass_project/app/helpers/application_helper.rb | 2 +
test/fixtures/sass_project/app/mailers/.gitkeep | 0
test/fixtures/sass_project/app/models/.gitkeep | 0
.../app/views/layouts/application.html.erb | 14 ++
test/fixtures/sass_project/config.ru | 4 +
test/fixtures/sass_project/config/application.rb | 52 ++++
test/fixtures/sass_project/config/boot.rb | 6 +
test/fixtures/sass_project/config/database.yml | 25 ++
test/fixtures/sass_project/config/environment.rb | 5 +
.../config/environments/development.rb | 24 ++
.../sass_project/config/environments/production.rb | 58 +++++
.../sass_project/config/environments/test.rb | 43 ++++
.../config/initializers/backtrace_silencers.rb | 7 +
.../config/initializers/inflections.rb | 10 +
.../sass_project/config/initializers/mime_types.rb | 5 +
.../config/initializers/secret_token.rb | 7 +
.../config/initializers/session_store.rb | 8 +
.../config/initializers/wrap_parameters.rb | 12 +
test/fixtures/sass_project/config/locales/en.yml | 5 +
test/fixtures/sass_project/config/routes.rb | 58 +++++
test/fixtures/sass_project/db/seeds.rb | 7 +
test/fixtures/sass_project/doc/README_FOR_APP | 2 +
test/fixtures/sass_project/lib/tasks/.gitkeep | 0
test/fixtures/sass_project/log/.gitkeep | 0
test/fixtures/sass_project/public/404.html | 26 ++
test/fixtures/sass_project/public/422.html | 26 ++
test/fixtures/sass_project/public/500.html | 26 ++
test/fixtures/sass_project/public/favicon.ico | 0
test/fixtures/sass_project/public/index.html | 241 +++++++++++++++++++
test/fixtures/sass_project/public/robots.txt | 5 +
test/fixtures/sass_project/script/rails | 6 +
.../vendor/assets/stylesheets/.gitkeep | 0
test/fixtures/sass_project/vendor/plugins/.gitkeep | 0
test/fixtures/scss_project/.gitignore | 5 +
test/fixtures/scss_project/Gemfile | 7 +
test/fixtures/scss_project/README | 261 +++++++++++++++++++++
test/fixtures/scss_project/Rakefile | 7 +
.../scss_project/app/assets/images/1x1.png | Bin 0 -> 926 bytes
.../scss_project/app/assets/images/rails.png | Bin 0 -> 6646 bytes
.../app/assets/javascripts/application.js | 9 +
.../app/assets/stylesheets/_top_level_partial.scss | 3 +
.../app/assets/stylesheets/application.scss | 38 +++
.../app/assets/stylesheets/css_application.css | 11 +
.../app/assets/stylesheets/css_erb_handler.css.erb | 3 +
.../stylesheets/css_sass_erb_handler.sass.erb | 2 +
.../stylesheets/css_scss_erb_handler.scss.erb | 3 +
.../app/assets/stylesheets/globbed/globbed.scss | 3 +
.../stylesheets/globbed/nested/nested_glob.scss | 3 +
.../assets/stylesheets/import_css_application.scss | 5 +
.../stylesheets/partials/_css_sass_import.sass | 5 +
.../assets/stylesheets/partials/_sass_import.sass | 2 +
.../assets/stylesheets/partials/_scss_import.scss | 9 +
.../stylesheets/partials/_without_css_ext.scss | 3 +
.../partials/subfolder/_relative_sass.sass | 2 +
.../partials/subfolder/_relative_scss.scss | 3 +
.../partials/subfolder/relative_not_a_partial.scss | 3 +
.../assets/stylesheets/sass_erb_handler.sass.erb | 2 +
.../assets/stylesheets/scss_erb_handler.scss.erb | 3 +
.../assets/stylesheets/subfolder/_defaults.scss | 3 +
.../assets/stylesheets/subfolder/another_plain.css | 3 +
.../app/assets/stylesheets/subfolder/plain.css | 3 +
.../assets/stylesheets/subfolder/second_level.scss | 2 +
.../app/controllers/application_controller.rb | 3 +
.../scss_project/app/helpers/application_helper.rb | 2 +
test/fixtures/scss_project/app/mailers/.gitkeep | 0
test/fixtures/scss_project/app/models/.gitkeep | 0
.../app/views/layouts/application.html.erb | 14 ++
test/fixtures/scss_project/config.ru | 4 +
test/fixtures/scss_project/config/application.rb | 49 ++++
test/fixtures/scss_project/config/boot.rb | 6 +
test/fixtures/scss_project/config/database.yml | 25 ++
test/fixtures/scss_project/config/environment.rb | 5 +
.../config/environments/development.rb | 23 ++
.../scss_project/config/environments/production.rb | 57 +++++
.../scss_project/config/environments/test.rb | 42 ++++
.../config/initializers/backtrace_silencers.rb | 7 +
.../config/initializers/inflections.rb | 10 +
.../scss_project/config/initializers/mime_types.rb | 5 +
.../config/initializers/postprocessor.rb | 5 +
.../config/initializers/secret_token.rb | 7 +
.../config/initializers/session_store.rb | 8 +
.../config/initializers/wrap_parameters.rb | 12 +
test/fixtures/scss_project/config/locales/en.yml | 5 +
test/fixtures/scss_project/config/routes.rb | 58 +++++
test/fixtures/scss_project/db/seeds.rb | 7 +
test/fixtures/scss_project/doc/README_FOR_APP | 2 +
test/fixtures/scss_project/lib/tasks/.gitkeep | 0
test/fixtures/scss_project/log/.gitkeep | 0
test/fixtures/scss_project/public/404.html | 26 ++
test/fixtures/scss_project/public/422.html | 26 ++
test/fixtures/scss_project/public/500.html | 26 ++
test/fixtures/scss_project/public/favicon.ico | 0
test/fixtures/scss_project/public/index.html | 241 +++++++++++++++++++
test/fixtures/scss_project/public/robots.txt | 5 +
test/fixtures/scss_project/script/rails | 6 +
.../vendor/assets/stylesheets/.gitkeep | 0
test/fixtures/scss_project/vendor/plugins/.gitkeep | 0
test/sass_rails_generators_test.rb | 62 +++++
test/sass_rails_logger_test.rb | 27 +++
test/sass_rails_test.rb | 193 +++++++++++++++
test/support/sass_rails_test_case.rb | 181 ++++++++++++++
test/test_helper.rb | 27 +++
245 files changed, 4483 insertions(+), 258 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-sass-rails.git
More information about the Pkg-ruby-extras-commits
mailing list