[DRE-commits] [ruby-sass-rails] 01/03: Merge tag 'upstream/5.0.1'
Praveen Arimbrathodiyil
praveen at moszumanska.debian.org
Mon Mar 30 11:02:19 UTC 2015
This is an automated email from the git hooks/post-receive script.
praveen pushed a commit to branch master
in repository ruby-sass-rails.
commit 0a5269d8a6a900437eda43753d8dd3bd6f5c416b
Merge: e4fb46b d3c34f1
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date: Mon Mar 30 15:41:11 2015 +0530
Merge tag 'upstream/5.0.1'
Upstream version 5.0.1
# gpg: Signature made Monday 30 March 2015 03:41:04 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 | 6 -
.travis.yml | 23 --
CHANGELOG.md | 16 +
Gemfile | 8 -
README.md | 19 +-
Rakefile | 28 --
.../generators/sass/assets/assets_generator.rb | 2 +-
.../{stylesheet.css.sass => stylesheet.sass} | 0
lib/rails/generators/sass_scaffold.rb | 3 +-
.../generators/scss/assets/assets_generator.rb | 2 +-
.../{stylesheet.css.scss => stylesheet.scss} | 0
lib/sass/rails/cache_store.rb | 31 ++
lib/sass/rails/helpers.rb | 23 +-
lib/sass/rails/importer.rb | 205 ++++++++-----
lib/sass/rails/railtie.rb | 20 +-
lib/sass/rails/template.rb | 90 ++++--
lib/sass/rails/version.rb | 2 +-
metadata.yml | 328 +++++----------------
sass-rails.gemspec | 26 --
sass-rails.gemspec.erb | 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 926 -> 0 bytes
.../app/assets/images/rails.png | Bin 6646 -> 0 bytes
.../app/assets/javascripts/application.js | 9 -
.../assets/stylesheets/_top_level_partial.css.scss | 3 -
.../app/assets/stylesheets/application.css.scss | 32 --
.../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 | 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 | 56 ----
.../config/environments/test.rb | 38 ---
.../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 | 80 -----
.../test/dummy/config/environments/test.rb | 36 ---
.../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 6646 -> 0 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 | 21 --
.../sass_project/config/environments/production.rb | 51 ----
.../sass_project/config/environments/test.rb | 36 ---
.../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 926 -> 0 bytes
.../scss_project/app/assets/images/rails.png | Bin 6646 -> 0 bytes
.../app/assets/javascripts/application.js | 9 -
.../assets/stylesheets/_top_level_partial.css.scss | 3 -
.../app/assets/stylesheets/application.css.scss | 37 ---
.../app/assets/stylesheets/css_application.css | 7 -
.../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/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/sass_erb_handler.sass.erb | 2 -
.../assets/stylesheets/scss_erb_handler.scss.erb | 3 -
.../stylesheets/subfolder/_defaults.css.scss | 3 -
.../assets/stylesheets/subfolder/another_plain.css | 3 -
.../app/assets/stylesheets/subfolder/plain.css | 3 -
.../stylesheets/subfolder/second_level.css.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 | 53 ----
.../scss_project/config/environments/test.rb | 38 ---
.../config/initializers/backtrace_silencers.rb | 7 -
.../config/initializers/inflections.rb | 10 -
.../scss_project/config/initializers/mime_types.rb | 5 -
.../config/initializers/postprocessor.rb | 3 -
.../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/gemfiles/Gemfile-4-0-stable | 9 -
test/gemfiles/Gemfile-4-1-stable | 9 -
test/sass_rails_generators_test.rb | 62 ----
test/sass_rails_logger_test.rb | 24 --
test/sass_rails_test.rb | 133 ---------
test/support/sass_rails_test_case.rb | 166 -----------
test/test_helper.rb | 25 --
240 files changed, 343 insertions(+), 4675 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