diff --git a/lib/site_template/_layouts/post.html b/lib/site_template/_layouts/post.html index 3a0fb52e..2592391f 100644 --- a/lib/site_template/_layouts/post.html +++ b/lib/site_template/_layouts/post.html @@ -4,7 +4,7 @@ layout: default
-

{{ page.title }}

+

{{ page.title | escape }}

{% if page.author %} • {% endif %}

diff --git a/lib/site_template/index.html b/lib/site_template/index.html index 83d93985..9fbc9b70 100644 --- a/lib/site_template/index.html +++ b/lib/site_template/index.html @@ -12,7 +12,7 @@ layout: default {{ post.date | date: "%b %-d, %Y" }}

- {{ post.title }} + {{ post.title | escape }}

{% endfor %} From aa1b5652286429e367ca161ec93821c45f38c4e5 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 29 Feb 2016 15:29:30 -0800 Subject: [PATCH 12/29] Update history to reflect merge of #4606 [ci skip] --- History.markdown | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/History.markdown b/History.markdown index e453f01b..528b6128 100644 --- a/History.markdown +++ b/History.markdown @@ -1,5 +1,9 @@ ## HEAD +### Bug Fixes + + * Site template: Escape title and description where it is used in HTML (#4606) + ### Development Fixes * Add project maintainer profile links (#4591) From ae228705b26267bc750b1c75a0fcc3f2147f31db Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 29 Feb 2016 15:46:11 -0800 Subject: [PATCH 13/29] Document#date: drafts which have no date should use source file mtime --- lib/jekyll/document.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/document.rb b/lib/jekyll/document.rb index 10f1203e..6768fcf6 100644 --- a/lib/jekyll/document.rb +++ b/lib/jekyll/document.rb @@ -68,7 +68,11 @@ module Jekyll end def date - data['date'] ||= site.time + data['date'] ||= (draft? ? source_file_mtime : site.time) + end + + def source_file_mtime + @source_file_mtime ||= File.mtime(path) end # Returns whether the document is a draft. This is only the case if From 0114c51c6ead0679d82534b98f730aabe2bf90b5 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 29 Feb 2016 15:50:30 -0800 Subject: [PATCH 14/29] Update history to reflect merge of #4545 [ci skip] --- History.markdown | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/History.markdown b/History.markdown index 528b6128..30fdc02d 100644 --- a/History.markdown +++ b/History.markdown @@ -1,5 +1,9 @@ ## HEAD +### Minor Enhancements + + * Allow collections to have documents that have no file extension (#4545) + ### Bug Fixes * Site template: Escape title and description where it is used in HTML (#4606) From 8e81dd69ec3759ed4a4b8a318ae0cc2d2d1bd47e Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 29 Feb 2016 15:52:10 -0800 Subject: [PATCH 15/29] Remove Ruby 2.0.0 from TravisCI matrix. Fixes #4381. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5c6e5855..842bfa90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,6 @@ rvm: - &ruby1 2.3.0 - &ruby2 2.2.4 - &ruby3 2.1.8 - - &ruby4 2.0.0-p648 - &jruby jruby-9.0.4.0 - &rhead ruby-head From b638c946251f8552dad5b644d101cb5c5c1f9da4 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 29 Feb 2016 15:53:22 -0800 Subject: [PATCH 16/29] Update history to reflect closure of #4381. [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 30fdc02d..7927a9ab 100644 --- a/History.markdown +++ b/History.markdown @@ -2,6 +2,7 @@ ### Minor Enhancements + * Stop testing with Ruby 2.0.x, which is EOL'd. (#4381) * Allow collections to have documents that have no file extension (#4545) ### Bug Fixes From f2c428bedc28e7898edd70fa719fd3a4279f07f9 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 29 Feb 2016 16:00:53 -0800 Subject: [PATCH 17/29] Update history to reflect merge of #4611 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 7927a9ab..931bf1c3 100644 --- a/History.markdown +++ b/History.markdown @@ -8,6 +8,7 @@ ### Bug Fixes * Site template: Escape title and description where it is used in HTML (#4606) + * Document#date: drafts which have no date should use source file mtime (#4611) ### Development Fixes From 38d24454301a91e2be767988f6af68076d3b3f52 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 29 Feb 2016 16:07:13 -0800 Subject: [PATCH 18/29] Update history to reflect merge of #4602 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 931bf1c3..942d6763 100644 --- a/History.markdown +++ b/History.markdown @@ -19,6 +19,7 @@ * Add jekyll-seo-tag, jekyll-avatar, and jekyll-sitemap to the site (#4553) * Add Google search query to /docs/help/ (#4589) * Upgrading, documentation (#4597) + * Add 'view source' entry (#4602) ## 3.1.2 / 2016-02-19 From 390fc1123964e939a3b31b6f2b691537919fad1f Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 29 Feb 2016 16:08:11 -0800 Subject: [PATCH 19/29] Update history to reflect merge of #4557 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 942d6763..1706488a 100644 --- a/History.markdown +++ b/History.markdown @@ -4,6 +4,7 @@ * Stop testing with Ruby 2.0.x, which is EOL'd. (#4381) * Allow collections to have documents that have no file extension (#4545) + * Add size property to group_by result (#4557) ### Bug Fixes From 39a4dc6fb75ea2656fbafa14cd83cffe336bdc25 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 29 Feb 2016 16:12:06 -0800 Subject: [PATCH 20/29] Update history to reflect merge of #4590 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 1706488a..ca32d80e 100644 --- a/History.markdown +++ b/History.markdown @@ -10,6 +10,7 @@ * Site template: Escape title and description where it is used in HTML (#4606) * Document#date: drafts which have no date should use source file mtime (#4611) + * Filters#time: clone an input Time so as to be non-destructive (#4590) ### Development Fixes From 14e9ec2bbbe610b3a8f7d62f02fc65495cd7f0aa Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 29 Feb 2016 16:17:49 -0800 Subject: [PATCH 21/29] Doctor: correctly set key name so --config works Fixes #4598 --- lib/jekyll/commands/doctor.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jekyll/commands/doctor.rb b/lib/jekyll/commands/doctor.rb index 3a263501..5c48d5be 100644 --- a/lib/jekyll/commands/doctor.rb +++ b/lib/jekyll/commands/doctor.rb @@ -8,7 +8,7 @@ module Jekyll c.description 'Search site and print specific deprecation warnings' c.alias(:hyde) - c.option '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file' + c.option 'config', '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file' c.action do |_, options| Jekyll::Commands::Doctor.process(options) From f66f791668aa7c074c7f599d12f3b59a4ac718ea Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 29 Feb 2016 16:20:49 -0800 Subject: [PATCH 22/29] Update history to reflect resolution of #4598 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index ca32d80e..1168c784 100644 --- a/History.markdown +++ b/History.markdown @@ -11,6 +11,7 @@ * Site template: Escape title and description where it is used in HTML (#4606) * Document#date: drafts which have no date should use source file mtime (#4611) * Filters#time: clone an input Time so as to be non-destructive (#4590) + * Doctor: fix issue where `--config` wasn't a recognized flag (#4598) ### Development Fixes From b0c730d27843ca974ec494298bd08c82b58d3e99 Mon Sep 17 00:00:00 2001 From: Saleem Rashid Date: Tue, 1 Mar 2016 18:38:12 +0000 Subject: [PATCH 23/29] kramdown: fix state leakage (#4617) in test fixes #4250 --- test/test_kramdown.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb index fc18c4ce..c9316936 100644 --- a/test/test_kramdown.rb +++ b/test/test_kramdown.rb @@ -14,6 +14,7 @@ class TestKramdown < JekyllUnitTest 'auto_ids' => false, 'footnote_nr' => 1, + 'syntax_highlighter' => 'rouge', 'syntax_highlighter_opts' => { 'bold_every' => 8, 'css' => :class } From 377d212ecc30af9ab1f8d76371e04cf0b7cf6926 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Tue, 1 Mar 2016 11:59:08 -0800 Subject: [PATCH 24/29] Update history to reflect merge of #4618 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 1168c784..29d83381 100644 --- a/History.markdown +++ b/History.markdown @@ -16,6 +16,7 @@ ### Development Fixes * Add project maintainer profile links (#4591) + * Fix state leakage in Kramdown test (#4618) ### Site Enhancements From 67904e849d6d0575c8f9e5d1d24852d37343030b Mon Sep 17 00:00:00 2001 From: Jeff Kolesky Date: Tue, 1 Mar 2016 12:05:49 -0800 Subject: [PATCH 25/29] Ensures related_posts are only set for a post Prior to this change, the related posts for the most recently rendered post stayed set on the `site` object. This could result in pages that showed related posts even when the page represented an entire collection of posts, such as on an index page. This change restores the functionality from Jekyll V2. --- features/create_sites.feature | 17 +++++++++++++++++ lib/jekyll/renderer.rb | 2 ++ 2 files changed, 19 insertions(+) diff --git a/features/create_sites.feature b/features/create_sites.feature index 031fa434..c1f75931 100644 --- a/features/create_sites.feature +++ b/features/create_sites.feature @@ -186,3 +186,20 @@ Feature: Create sites Then I should get a zero exit status And the _site directory should exist And the "_site/2020/12/31/entry1.html" file should exist + + Scenario: Basic site with layouts, posts and related posts + Given I have a _layouts directory + And I have a page layout that contains "Page {{ page.title }}: {{ content }}" + And I have a post layout that contains "Post {{ page.title }}: {{ content }}Related posts: {{ site.related_posts | size }}" + And I have an "index.html" page with layout "page" that contains "Site contains {{ site.pages.size }} pages and {{ site.posts.size }} posts; Related posts: {{ site.related_posts | size }}" + And I have a _posts directory + And I have the following posts: + | title | date | layout | content | + | entry1 | 2009-03-27 | post | content for entry1. | + | entry2 | 2009-04-27 | post | content for entry2. | + When I run jekyll build + Then I should get a zero exit status + And the _site directory should exist + And I should see "Page : Site contains 1 pages and 2 posts; Related posts: 0" in "_site/index.html" + And I should see "Post entry1:

content for entry1.

\nRelated posts: 1" in "_site/2009/03/27/entry1.html" + And I should see "Post entry2:

content for entry2.

\nRelated posts: 1" in "_site/2009/04/27/entry2.html" diff --git a/lib/jekyll/renderer.rb b/lib/jekyll/renderer.rb index 09815a60..7d20d452 100644 --- a/lib/jekyll/renderer.rb +++ b/lib/jekyll/renderer.rb @@ -40,6 +40,8 @@ module Jekyll if document.is_a?(Document) && document.collection.label == 'posts' payload['site']['related_posts'] = document.related_posts + else + payload['site']['related_posts'] = nil end # render and transform content (this becomes the final content of the object) From 928faed7c7952225ce9fa2f205b8c7323077db0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eug=C3=AAnio=20Cabral?= Date: Tue, 1 Mar 2016 17:18:08 -0300 Subject: [PATCH 26/29] Add jekyll-video-embed --- site/_docs/plugins.md | 1 + 1 file changed, 1 insertion(+) diff --git a/site/_docs/plugins.md b/site/_docs/plugins.md index a8953f91..932fd204 100644 --- a/site/_docs/plugins.md +++ b/site/_docs/plugins.md @@ -845,6 +845,7 @@ LESS.js files during generation. - [Jekyll-Youtube](https://github.com/dommmel/jekyll-youtube) A Liquid tag that embeds Youtube videos. The default emded markup is responsive but you can also specify your own by using an include/partial. - [Jekyll Flickr Plugin](https://github.com/lawmurray/indii-jekyll-flickr) by [Lawrence Murray](http://www.indii.org): Embeds Flickr photosets (albums) as a gallery of thumbnails, with lightbox links to larger images. - [jekyll-figure](https://github.com/paulrobertlloyd/jekyll-figure): A liquid tag for Jekyll that generates `
` elements. +- [Jekyll Video Embed](https://github.com/eug/jekyll-video-embed): It provides several tags to easily embed videos (e.g. Youtube, Vimeo, UStream and Ted Talks) #### Collections From de8f67c4a22931cdf41c0993d97a6d37268b926e Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 1 Mar 2016 19:43:22 -0800 Subject: [PATCH 27/29] Fix link issues in the site found by HTML Proofer. --- Gemfile | 2 +- script/proof | 3 ++- site/_docs/extras.md | 2 +- site/_docs/resources.md | 4 ++-- test/test_filters.rb | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 72e55e68..5aad2c4d 100644 --- a/Gemfile +++ b/Gemfile @@ -55,7 +55,7 @@ end group :jekyll_optional_dependencies do gem "toml", "~> 0.1.0" gem "coderay", "~> 1.1.0" - gem "jekyll-docs", :path => '../docs' if Dir.exist?('../docs') + gem "jekyll-docs", :path => '../docs' if Dir.exist?('../docs') && ENV['JEKYLL_VERSION'] gem "jekyll-gist", "~> 1.0" gem "jekyll-feed", "~> 0.1.3" gem "jekyll-coffeescript", "~> 1.0" diff --git a/script/proof b/script/proof index 01da5016..a5de7fd6 100755 --- a/script/proof +++ b/script/proof @@ -14,6 +14,7 @@ INGORE_HREFS=$(ruby -e 'puts %w{ twitter.com nearlyfreespeech.net eduardoboucas.com + github.com\/matrix9180 }.map{|h| "/#{h}/"}.join(",")') SOURCE="site" DESTINATION="_site" @@ -31,4 +32,4 @@ bundle exec jekyll build -s $SOURCE -d $DESTINATION --trace # 3. msg "Proofing..." -time bundle exec htmlproof ./$DESTINATION --href-ignore $INGORE_HREFS +time bundle exec htmlproof ./$DESTINATION --url-ignore $INGORE_HREFS diff --git a/site/_docs/extras.md b/site/_docs/extras.md index 708d8718..5abd0d73 100644 --- a/site/_docs/extras.md +++ b/site/_docs/extras.md @@ -15,7 +15,7 @@ Kramdown comes with optional support for LaTeX to PNG rendering via [MathJax](ht {% endhighlight %} -For more information about getting started, check out [this excellent blog post](https://gastonsanchez.com/opinion/2014/02/16/Mathjax-with-jekyll/). +For more information about getting started, check out [this excellent blog post](http://gastonsanchez.com/opinion/2014/02/16/Mathjax-with-jekyll/). ## Alternative Markdown Processors diff --git a/site/_docs/resources.md b/site/_docs/resources.md index 2ba5f25e..261100f0 100644 --- a/site/_docs/resources.md +++ b/site/_docs/resources.md @@ -14,7 +14,7 @@ Jekyll’s growing use is producing a wide variety of tutorials, frameworks, ext - [Blogging with Git, Emacs and Jekyll](http://metajack.im/2009/01/23/blogging-with-git-emacs-and-jekyll/) - [Tips for working with GitHub Pages Integration](https://gist.github.com/jedschneider/2890453) -### Integrations +### Integrations - [Use FormKeep as a backend for forms (contact forms, hiring forms, etc.)](https://formkeep.com/guides/how-to-make-a-contact-form-in-jekyll?utm_source=github&utm_medium=jekyll-docs&utm_campaign=contact-form-jekyll) - [Use Simple Form to add a simple contact form](http://getsimpleform.com/) @@ -24,7 +24,7 @@ Jekyll’s growing use is producing a wide variety of tutorials, frameworks, ext ### Other commentary -- [‘My Jekyll Fork’, by Mike West](http://mikewest.org/2009/11/my-jekyll-fork) +- [‘My Jekyll Fork’, by Mike West](https://mikewest.org/2009/11/my-jekyll-fork) > “Jekyll is a well-architected throwback to a time before WordPress, when men were men, and HTML was static. I like the ideas it espouses, and have made a few improvements to it’s core. Here, I’ll point out some highlights of my fork in the hopes that they see usage beyond this site.” diff --git a/test/test_filters.rb b/test/test_filters.rb index d3c10f5a..d8bce740 100644 --- a/test/test_filters.rb +++ b/test/test_filters.rb @@ -298,9 +298,9 @@ class TestFilters < JekyllUnitTest end should "include the size of each grouping" do - @filter.site.process grouping = @filter.group_by(@filter.site.pages, "layout") grouping.each do |g| + p g assert_equal g["items"].size, g["size"], "The size property for '#{g["name"]}' doesn't match the size of the Array." end end From 3954cb4dd45cada300b8a44c713f084339e70953 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Tue, 1 Mar 2016 19:59:49 -0800 Subject: [PATCH 28/29] Update history to reflect merge of #4621 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 29d83381..519d2d50 100644 --- a/History.markdown +++ b/History.markdown @@ -24,6 +24,7 @@ * Add Google search query to /docs/help/ (#4589) * Upgrading, documentation (#4597) * Add 'view source' entry (#4602) + * Add jekyll-video-embed to list of third-party plugins. (#4621) ## 3.1.2 / 2016-02-19 From 81c88d683305c168ea28a4e17e1616c45461cc09 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Tue, 1 Mar 2016 20:00:49 -0800 Subject: [PATCH 29/29] Update history to reflect merge of #4620 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 519d2d50..ea0f5e7e 100644 --- a/History.markdown +++ b/History.markdown @@ -12,6 +12,7 @@ * Document#date: drafts which have no date should use source file mtime (#4611) * Filters#time: clone an input Time so as to be non-destructive (#4590) * Doctor: fix issue where `--config` wasn't a recognized flag (#4598) + * Ensures related_posts are only set for a post (#4620) ### Development Fixes