[DRE-commits] [ruby-sass-rails] 01/06: Merge tag 'upstream/4.0.3'
Antonio Terceiro
terceiro at moszumanska.debian.org
Sun Aug 3 03:12:37 UTC 2014
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 0d90b2d1096ef113e65c11786f71febbd6930f49
Merge: 325cd94 21d64c1
Author: Antonio Terceiro <terceiro at debian.org>
Date: Sun Jul 27 12:05:07 2014 -0300
Merge tag 'upstream/4.0.3'
Upstream version 4.0.3
# gpg: Signature made Dom 27 Jul 2014 12:05:01 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 | 22 +-
CHANGELOG.md | 50 +++-
Gemfile | 13 +-
README.markdown | 75 ------
README.md | 98 ++++++++
Rakefile | 17 ++
checksums.yaml.gz | Bin 0 -> 268 bytes
lib/sass/rails.rb | 11 +-
lib/sass/rails/compressor.rb | 19 --
lib/sass/rails/helpers.rb | 58 ++---
lib/sass/rails/importer.rb | 130 +++++-----
lib/sass/rails/railtie.rb | 25 +-
lib/sass/rails/template.rb | 28 +++
lib/sass/rails/template_handlers.rb | 117 ---------
lib/sass/rails/version.rb | 2 +-
metadata.yml | 268 +++++++++++++++++----
sass-rails.gemspec | 16 +-
sass-rails.gemspec => sass-rails.gemspec.erb | 16 +-
test/fixtures/alternate_config_project/.gitignore | 5 +
test/fixtures/alternate_config_project/Gemfile | 7 +
test/fixtures/alternate_config_project/README | 261 ++++++++++++++++++++
.../dummy => alternate_config_project}/Rakefile | 2 +-
.../app/assets/images/1x1.png | Bin 0 -> 926 bytes
.../app/assets/images/rails.png | Bin 0 -> 6646 bytes
.../app/assets/javascripts}/application.js | 0
.../assets/stylesheets/_top_level_partial.css.scss | 3 +
.../app/assets/stylesheets/application.css.scss | 4 +-
.../app/assets/stylesheets/css_application.css | 7 +
.../assets/stylesheets/globbed/globbed.css.scss | 3 +
.../globbed/nested/nested_glob.css.scss | 3 +
.../stylesheets/partials/_sass_import.css.sass | 5 +
.../stylesheets/partials/_scss_import.css.scss | 9 +
.../stylesheets/partials/_without_css_ext.scss | 3 +
.../partials/subfolder/_relative_sass.css.sass | 2 +
.../partials/subfolder/_relative_scss.css.scss | 3 +
.../subfolder/relative_not_a_partial.css.scss | 3 +
.../assets/stylesheets/subfolder/another_plain.css | 3 +
.../app/assets/stylesheets/subfolder/plain.css | 3 +
.../stylesheets/subfolder/second_level.css.scss | 0
.../app/controllers/application_controller.rb | 0
.../app/helpers/application_helper.rb | 2 +
.../app/mailers}/.gitkeep | 0
.../app/models}/.gitkeep | 0
.../app/views/layouts/application.html.erb | 2 +-
test/fixtures/alternate_config_project/config.ru | 4 +
.../config/application.rb | 15 +-
.../alternate_config_project/config/boot.rb | 6 +
.../alternate_config_project/config/database.yml | 25 ++
.../config/environment.rb | 2 +-
.../config/environments/development.rb | 10 +-
.../config/environments/production.rb | 6 +-
.../config/environments/test.rb | 5 +-
.../config/initializers/backtrace_silencers.rb | 7 +
.../config/initializers/inflections.rb | 0
.../config/initializers/mime_types.rb | 5 +
.../config/initializers/secret_token.rb | 2 +-
.../config/initializers/session_store.rb | 4 +-
.../config/initializers/wrap_parameters.rb | 4 +-
.../config/locales/en.yml | 0
.../alternate_config_project/config/routes.rb | 58 +++++
.../db/seeds.rb | 0
.../alternate_config_project/doc/README_FOR_APP | 2 +
.../lib/tasks}/.gitkeep | 0
.../log}/.gitkeep | 0
.../public/404.html | 0
.../public/422.html | 0
.../public/500.html | 0
.../public/favicon.ico} | 0
.../alternate_config_project/public/index.html | 241 ++++++++++++++++++
.../alternate_config_project/public/robots.txt | 5 +
.../script/rails | 0
.../vendor/assets/stylesheets}/.gitkeep | 0
.../vendor/plugins}/.gitkeep | 0
test/fixtures/engine_project/.gitignore | 4 +-
test/fixtures/engine_project/Gemfile | 13 +-
test/fixtures/engine_project/MIT-LICENSE | 20 ++
test/fixtures/engine_project/Rakefile | 15 +-
.../images/engine_project/{.gitkeep => .keep} | 0
.../javascripts/engine_project/application.js | 15 +-
.../stylesheets/engine_project/application.css | 16 +-
.../layouts/engine_project/application.html.erb | 2 +-
.../fixtures/engine_project/engine_project.gemspec | 25 +-
.../engine_project/lib/engine_project/engine.rb | 2 +-
test/fixtures/engine_project/script/rails | 8 +-
.../fixtures/engine_project/test/dummy/README.rdoc | 28 +++
test/fixtures/engine_project/test/dummy/Rakefile | 1 -
.../dummy/app/assets/javascripts/application.js | 15 +-
.../dummy/app/assets/stylesheets/application.css | 16 +-
.../app/controllers/application_controller.rb | 4 +-
.../dummy/app/controllers/concerns/.keep} | 0
.../.gitkeep => test/dummy/app/mailers/.keep} | 0
.../.gitkeep => test/dummy/app/models/.keep} | 0
.../dummy/app/models/concerns/.keep} | 0
.../dummy/app/views/layouts/application.html.erb | 4 +-
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/dummy/config/application.rb | 21 +-
.../engine_project/test/dummy/config/boot.rb | 1 -
.../test/dummy/config/environment.rb | 4 +-
.../test/dummy/config/environments/development.rb | 22 +-
.../test/dummy/config/environments/production.rb | 69 ++++--
.../test/dummy/config/environments/test.rb | 31 ++-
.../initializers/filter_parameter_logging.rb | 4 +
.../test/dummy/config/initializers/inflections.rb | 12 +-
.../test/dummy/config/initializers/secret_token.rb | 7 +-
.../dummy/config/initializers/session_store.rb | 7 +-
.../dummy/config/initializers/wrap_parameters.rb | 14 +-
.../test/dummy/config/locales/en.yml | 22 +-
.../fixtures/engine_project/test/dummy/db/seeds.rb | 7 -
.../.gitkeep => test/dummy/lib/assets/.keep} | 0
.../.gitkeep => test/dummy/log/.keep} | 0
.../engine_project/test/dummy/public/404.html | 3 +-
.../engine_project/test/dummy/public/422.html | 2 +-
.../engine_project/test/dummy/public/500.html | 4 +-
test/fixtures/sass_project/Gemfile | 6 +-
.../config/environments/development.rb | 6 -
.../sass_project/config/environments/production.rb | 3 -
.../sass_project/config/environments/test.rb | 3 -
test/fixtures/scss_project/Gemfile | 6 +-
.../app/assets/stylesheets/application.css.scss | 9 +-
.../app/assets/stylesheets/css_erb_handler.css.erb | 3 +
.../stylesheets/css_sass_erb_handler.css.sass.erb | 2 +
.../stylesheets/css_scss_erb_handler.css.scss.erb | 3 +
.../assets/stylesheets/sass_erb_handler.sass.erb | 2 +
.../assets/stylesheets/scss_erb_handler.scss.erb | 3 +
.../stylesheets/subfolder/_defaults.css.scss | 3 +
.../stylesheets/subfolder/second_level.css.scss | 3 +-
.../config/environments/development.rb | 6 +-
.../scss_project/config/environments/production.rb | 5 +-
.../scss_project/config/environments/test.rb | 5 +-
.../config/initializers/postprocessor.rb | 3 +
test/gemfiles/Gemfile-master | 8 +
test/sass_rails_generators_test.rb | 62 +++++
test/sass_rails_logger_test.rb | 4 +-
test/sass_rails_test.rb | 197 ++++++++-------
test/support/sass_rails_test_case.rb | 17 +-
test/test_helper.rb | 11 +-
139 files changed, 1752 insertions(+), 746 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