[DRE-commits] [jekyll] 01/07: Merge tag 'upstream/3.2.1+dfsg'

Cédric Boutillier boutil at moszumanska.debian.org
Wed Aug 24 15:24:02 UTC 2016


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

boutil pushed a commit to branch master
in repository jekyll.

commit 19811890fbdb4259564d1f201b5635bf0ffb3714
Merge: fc64874 08d2114
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Aug 24 13:02:24 2016 +0200

    Merge tag 'upstream/3.2.1+dfsg'
    
    Upstream version 3.2.1+dfsg
    
    # gpg: keyserver option 'ca-cert-file' is obsolete; please use 'hkp-cacert' in dirmngr.conf
    # gpg: Signature faite le mer. 24 août 2016 13:02:23 CEST
    # gpg:                avec la clef RSA 0x89AF82B739CD217A
    # gpg: Bonne signature de « Cédric Boutillier <boutil at debian.org> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at upmc.fr> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at polytechnique.org> » [ultime]
    # gpg:                 alias « Cédric Boutillier <cedric.boutillier at gmail.com> » [ultime]
    # Empreinte de clef principale : 3041 4D81 DC28 290C 2568  6DE3 DA49 58F6 11E1 49E9
    #    Empreinte de la sous-clef : 9CCD 6B31 9DBF 8E40 AB1A  BD1A 89AF 82B7 39CD 217A

 .codeclimate.yml                                   |  50 +-
 .github/CONTRIBUTING.markdown                      | 122 +++++
 .github/ISSUE_TEMPLATE.md                          |  78 +++
 .gitignore                                         |   1 +
 .rubocop.yml                                       | 200 ++++---
 .travis.yml                                        |  23 +-
 CONDUCT.markdown                                   |   2 +-
 CONTRIBUTING.markdown                              | 106 ----
 Gemfile                                            |  30 +-
 History.markdown                                   | 244 ++++++++-
 ISSUE_TEMPLATE.md                                  |  20 -
 README.markdown                                    |  36 +-
 Rakefile                                           |  28 +
 appveyor.yml                                       |  60 +++
 benchmark/capture-assign.rb                        |  20 +
 benchmark/regexp-vs-include.rb                     |  51 ++
 docs/avoiding-burnout.md                           |  27 +
 docs/becoming-a-maintainer.md                      |  35 ++
 docs/merging-a-pull-request.md                     |  50 ++
 docs/readme.md                                     |  13 +
 docs/reviewing-a-pull-request.md                   |  44 ++
 docs/special-labels.md                             |  17 +
 docs/triaging-an-issue.md                          |  51 ++
 {bin => exe}/jekyll                                |  32 +-
 features/collections.feature                       |  27 +-
 features/create_sites.feature                      |  17 +
 features/highlighting.feature                      |  33 ++
 features/hooks.feature                             |  25 +
 features/step_definitions.rb                       |  83 +--
 features/support/formatter.rb                      |  68 ++-
 features/support/helpers.rb                        |  45 +-
 features/theme.feature                             |  72 +++
 jekyll.gemspec                                     |   8 +-
 lib/jekyll.rb                                      | 151 +++---
 lib/jekyll/cleaner.rb                              |  19 +-
 lib/jekyll/collection.rb                           |  56 +-
 lib/jekyll/command.rb                              |  32 +-
 lib/jekyll/commands/build.rb                       |  36 +-
 lib/jekyll/commands/clean.rb                       |  31 +-
 lib/jekyll/commands/doctor.rb                      |  18 +-
 lib/jekyll/commands/help.rb                        |   7 +-
 lib/jekyll/commands/new.rb                         |  66 ++-
 lib/jekyll/commands/new_theme.rb                   |  36 ++
 lib/jekyll/commands/serve.rb                       |  61 ++-
 lib/jekyll/commands/serve/servlet.rb               |   9 +-
 lib/jekyll/configuration.rb                        | 298 ++++++-----
 lib/jekyll/converter.rb                            |   8 +-
 lib/jekyll/converters/markdown.rb                  |  30 +-
 lib/jekyll/converters/markdown/kramdown_parser.rb  |  18 +-
 lib/jekyll/converters/markdown/rdiscount_parser.rb |   8 +-
 lib/jekyll/converters/markdown/redcarpet_parser.rb | 174 +++---
 lib/jekyll/convertible.rb                          |  68 ++-
 lib/jekyll/deprecator.rb                           |  17 +-
 lib/jekyll/document.rb                             | 108 ++--
 lib/jekyll/drops/document_drop.rb                  |  15 +-
 lib/jekyll/drops/drop.rb                           |  39 +-
 lib/jekyll/drops/excerpt_drop.rb                   |   2 +-
 lib/jekyll/drops/jekyll_drop.rb                    |   4 +-
 lib/jekyll/drops/site_drop.rb                      |   4 +-
 lib/jekyll/drops/url_drop.rb                       |   8 +-
 lib/jekyll/entry_filter.rb                         |  83 ++-
 lib/jekyll/errors.rb                               |   7 +
 lib/jekyll/excerpt.rb                              |   5 +-
 lib/jekyll/external.rb                             |   8 +-
 lib/jekyll/filters.rb                              | 156 ++++--
 lib/jekyll/frontmatter_defaults.rb                 |  87 +--
 lib/jekyll/hooks.rb                                |  41 +-
 lib/jekyll/layout.rb                               |  13 +-
 lib/jekyll/liquid_renderer.rb                      |  17 +-
 lib/jekyll/liquid_renderer/file.rb                 |   6 +-
 lib/jekyll/liquid_renderer/table.rb                |  22 +-
 lib/jekyll/log_adapter.rb                          |   4 +-
 lib/jekyll/page.rb                                 |  21 +-
 lib/jekyll/plugin.rb                               |  12 +-
 lib/jekyll/plugin_manager.rb                       |  28 +-
 lib/jekyll/publisher.rb                            |  10 +-
 lib/jekyll/reader.rb                               |  18 +-
 lib/jekyll/readers/data_reader.rb                  |  23 +-
 lib/jekyll/readers/layout_reader.rb                |  32 +-
 lib/jekyll/readers/page_reader.rb                  |   4 +-
 lib/jekyll/readers/post_reader.rb                  |  19 +-
 lib/jekyll/readers/static_file_reader.rb           |   4 +-
 lib/jekyll/regenerator.rb                          |  86 +--
 lib/jekyll/related_posts.rb                        |   2 +-
 lib/jekyll/renderer.rb                             |  56 +-
 lib/jekyll/site.rb                                 | 184 +++++--
 lib/jekyll/static_file.rb                          |  55 +-
 lib/jekyll/stevenson.rb                            |  11 +-
 lib/jekyll/tags/highlight.rb                       |  85 +--
 lib/jekyll/tags/include.rb                         | 123 +++--
 lib/jekyll/tags/link.rb                            |  33 ++
 lib/jekyll/tags/post_url.rb                        |  41 +-
 lib/jekyll/theme.rb                                |  58 ++
 lib/jekyll/theme_builder.rb                        | 117 ++++
 lib/jekyll/url.rb                                  |  35 +-
 lib/jekyll/utils.rb                                |  83 +--
 lib/jekyll/utils/ansi.rb                           |  18 +-
 lib/jekyll/utils/platforms.rb                      |   4 +-
 lib/jekyll/version.rb                              |   2 +-
 lib/site_template/_config.yml                      |  12 +-
 lib/site_template/_includes/footer.html            |  38 --
 lib/site_template/_includes/head.html              |  12 -
 lib/site_template/_includes/header.html            |  27 -
 lib/site_template/_includes/icon-github.html       |   1 -
 lib/site_template/_includes/icon-github.svg        |   1 -
 lib/site_template/_includes/icon-twitter.html      |   1 -
 lib/site_template/_includes/icon-twitter.svg       |   1 -
 lib/site_template/_layouts/default.html            |  20 -
 lib/site_template/_layouts/page.html               |  14 -
 lib/site_template/_layouts/post.html               |  15 -
 lib/site_template/_sass/_base.scss                 | 206 -------
 lib/site_template/_sass/_layout.scss               | 242 ---------
 lib/site_template/_sass/_syntax-highlighting.scss  |  71 ---
 lib/site_template/about.md                         |   4 +-
 lib/site_template/css/main.scss                    |  20 +-
 lib/site_template/index.html                       |   2 +-
 lib/theme_template/CODE_OF_CONDUCT.md.erb          |  74 +++
 lib/theme_template/Gemfile                         |   2 +
 lib/theme_template/LICENSE.txt.erb                 |  21 +
 lib/theme_template/README.md.erb                   |  48 ++
 lib/theme_template/_layouts/default.html           |   1 +
 lib/theme_template/_layouts/page.html              |   5 +
 lib/theme_template/_layouts/post.html              |   5 +
 lib/theme_template/example/_config.yml.erb         |   1 +
 lib/theme_template/example/_post.md                |  12 +
 lib/theme_template/example/index.html              |  14 +
 lib/theme_template/example/style.scss              |   7 +
 lib/theme_template/gitignore.erb                   |   4 +
 lib/theme_template/theme.gemspec.erb               |  18 +
 rake/release.rake                                  |   2 +-
 rake/site.rake                                     |  37 +-
 script/cibuild                                     |   4 +-
 script/default-site                                |  22 +
 script/fmt                                         |   3 +
 script/proof                                       |   5 +-
 script/rubies                                      |  14 +
 script/test                                        |  22 +-
 site/404.html                                      |  40 ++
 site/_config.yml                                   |  15 +-
 site/_data/docs.yml                                |   1 +
 site/_data/jekyllconf-talks.yml                    | 167 ++++++
 site/_docs/assets.md                               |  10 +-
 site/_docs/collections.md                          |  24 +-
 site/_docs/conduct.md                              |   3 +-
 site/_docs/configuration.md                        |  81 +--
 site/_docs/continuous-integration.md               |  34 +-
 site/_docs/contributing.md                         | 223 ++++----
 site/_docs/datafiles.md                            |   4 +-
 site/_docs/deployment-methods.md                   |  54 +-
 site/_docs/extras.md                               |   4 +-
 site/_docs/frontmatter.md                          |  64 +--
 site/_docs/github-pages.md                         |  16 +-
 site/_docs/history.md                              | 265 ++++++++-
 site/_docs/index.md                                |   4 +-
 site/_docs/installation.md                         |  14 +-
 site/_docs/migrations.md                           |   2 +-
 site/_docs/pages.md                                |   8 +-
 site/_docs/pagination.md                           |   4 +-
 site/_docs/permalinks.md                           |   1 -
 site/_docs/plugins.md                              |  29 +-
 site/_docs/posts.md                                |  12 +-
 site/_docs/quickstart.md                           |   5 +-
 site/_docs/resources.md                            |  15 +-
 site/_docs/sites.md                                |   2 -
 site/_docs/structure.md                            |   2 +-
 site/_docs/templates.md                            |  88 ++-
 site/_docs/themes.md                               |  89 ++++
 site/_docs/troubleshooting.md                      |  39 +-
 site/_docs/upgrading/0-to-2.md                     |   2 +-
 site/_docs/upgrading/2-to-3.md                     |  14 +-
 site/_docs/usage.md                                |   8 +-
 site/_docs/variables.md                            |  20 +-
 site/_docs/windows.md                              |  85 ++-
 site/_includes/docs_option.html                    |  12 +-
 site/_includes/docs_ul.html                        |  16 +-
 site/_includes/footer.html                         |   2 +-
 site/_includes/header.html                         |   2 +-
 site/_includes/news_item.html                      |   3 +-
 site/_includes/primary-nav-items.html              |   7 +-
 site/_includes/top.html                            |   2 +-
 site/_layouts/error.html                           |  23 +
 site/_layouts/news_item.html                       |   2 +-
 ...2015-01-24-jekyll-3-0-0-beta1-released.markdown |   2 +-
 ...-10-making-it-easier-to-contribute-to-jekyll.md |  17 +
 .../2016-04-19-jekyll-3-0-4-released.markdown      |  24 +
 .../2016-04-19-jekyll-3-1-3-released.markdown      |  18 +
 .../2016-04-26-jekyll-3-0-5-released.markdown      |  25 +
 .../2016-05-18-jekyll-3-1-4-released.markdown      |  26 +
 .../2016-05-18-jekyll-3-1-5-released.markdown      |  17 +
 .../2016-05-19-jekyll-3-1-6-released.markdown      |  19 +
 ...ekyll-s-google-summer-of-code-projects.markdown |  19 +
 .../2016-07-26-jekyll-3-2-0-released.markdown      | 125 +++++
 .../2016-08-02-jekyll-3-2-1-released.markdown      |  24 +
 site/_sass/_style.scss                             |  16 +
 site/community/index.md                            |  24 +
 site/help/index.md                                 |  14 +-
 site/img/article-footer.png                        | Bin 1863 -> 1581 bytes
 site/img/footer-logo.png                           | Bin 3783 -> 3688 bytes
 site/img/logo-2x.png                               | Bin 46514 -> 45966 bytes
 site/index.html                                    |  12 +-
 site/latest_version.txt                            |   2 +-
 test/fixtures/test-theme/_includes/include.html    |   1 +
 test/fixtures/test-theme/_layouts/default.html     |   1 +
 test/fixtures/test-theme/_sass/style.scss          |   3 +
 test/fixtures/test-theme/_symlink                  |   1 +
 test/fixtures/test-theme/test-theme.gemspec        |   9 +
 test/helper.rb                                     |  59 ++-
 test/simplecov_custom_profile.rb                   |  14 +-
 test/source/_methods/collection/entries            |   5 +
 test/test_ansi.rb                                  |   2 +-
 test/test_cleaner.rb                               |  68 ++-
 test/test_coffeescript.rb                          |   6 +-
 test/test_collections.rb                           |  39 +-
 test/test_command.rb                               |   2 +-
 test/test_commands_serve.rb                        |  33 +-
 test/test_configuration.rb                         | 318 +++++++----
 test/test_convertible.rb                           |  52 +-
 test/test_doctor_command.rb                        |  26 +-
 test/test_document.rb                              | 134 ++---
 test/test_drop.rb                                  |  42 ++
 test/test_entry_filter.rb                          |  77 ++-
 test/test_excerpt.rb                               |  42 +-
 test/test_excerpt_drop.rb                          |  20 +-
 test/test_filters.rb                               | 451 +++++++++++++---
 test/test_front_matter_defaults.rb                 |  28 +-
 test/test_generated_site.rb                        |  31 +-
 test/test_kramdown.rb                              |  54 +-
 test/test_layout_reader.rb                         |   5 +-
 test/test_liquid_extensions.rb                     |  15 +-
 test/test_liquid_renderer.rb                       |  10 +-
 test/test_log_adapter.rb                           |  31 +-
 test/test_new_command.rb                           |  62 ++-
 test/test_page.rb                                  | 170 +++---
 test/test_path_sanitization.rb                     |  14 +-
 test/test_plugin_manager.rb                        |  13 +-
 test/test_rdiscount.rb                             |  16 +-
 test/test_redcarpet.rb                             |  54 +-
 test/test_regenerator.rb                           |  29 +-
 test/test_related_posts.rb                         |  17 +-
 test/test_sass.rb                                  |  10 +-
 test/test_site.rb                                  | 265 ++++-----
 test/test_static_file.rb                           |  50 +-
 test/test_tags.rb                                  | 589 ++++++++++++++++-----
 test/test_theme.rb                                 |  66 +++
 test/test_url.rb                                   |  58 +-
 test/test_utils.rb                                 | 224 +++++---
 246 files changed, 7246 insertions(+), 3533 deletions(-)

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



More information about the Pkg-ruby-extras-commits mailing list