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 23/52] 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 24/52] 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 25/52] 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 26/52] 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 27/52] 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 28/52] 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 29/52] 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 30/52] 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 31/52] 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 32/52] 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 33/52] 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 34/52] 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 35/52] 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 36/52] 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 37/52] 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 7e21d2a98f608e1caaed18402e6305c259510128 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Tue, 1 Mar 2016 15:51:17 -0500 Subject: [PATCH 38/52] add content_for method --- Rakefile | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/Rakefile b/Rakefile index 6b70c955..aee5747e 100644 --- a/Rakefile +++ b/Rakefile @@ -89,22 +89,29 @@ end def siteify_file(file, front_matter = {}) abort "You seem to have misplaced your #{file} file. I can haz?" unless File.exists?(file) - contents = File.read(file) - title = contents.match(/\A# (.*)$/)[1] - output_file = file.sub(/\.markdown\z/, ".md").downcase - slug = File.basename(output_file, ".md") + title = File.read(file).match(/\A# (.*)$/)[1] + output_file = file.sub(/\.markdown\z/, ".md").downcase + slug = File.basename(output_file, ".md") front_matter = front_matter.merge({ "title" => title, "layout" => "docs", "permalink" => "/docs/#{slug}/", "note" => "This file is autogenerated. Edit /#{file} instead." }) - contents.gsub!(/\A# #{title}\n\n?/, "") - contents = converted_history(contents) if output_file == "history.md" - contents = "#{front_matter.to_yaml}---\n\n#{contents}" + contents = "#{front_matter.to_yaml}---\n\n#{content_for(file)}" File.write("site/_docs/#{output_file}", contents) end +def content_for(file) + contents = File.read(file) + case file + when "HISTORY.markdown" + converted_history(contents) + else + contents.gsub!(/\A# .*\n\n?/, "") + end +end + ############################################################################# # # Standard tasks From de8f67c4a22931cdf41c0993d97a6d37268b926e Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 1 Mar 2016 19:43:22 -0800 Subject: [PATCH 39/52] 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 40/52] 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 41/52] 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 From 059d7d2997aae2a78d9f90aeae2f479c38a3bfa0 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Wed, 2 Mar 2016 13:38:54 -0500 Subject: [PATCH 42/52] Properly case History.markdown --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index aee5747e..b86891f0 100644 --- a/Rakefile +++ b/Rakefile @@ -105,7 +105,7 @@ end def content_for(file) contents = File.read(file) case file - when "HISTORY.markdown" + when "History.markdown" converted_history(contents) else contents.gsub!(/\A# .*\n\n?/, "") From 301fe59dc698be282f1b6255b1e5af09cc113bcd Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Wed, 2 Mar 2016 13:46:54 -0500 Subject: [PATCH 43/52] update siteify_file to work with .github folder --- Rakefile | 7 +++--- rake/site.rake | 2 +- site/_docs/conduct.md | 2 +- site/_docs/contributing.md | 50 ++++++++++++++------------------------ 4 files changed, 23 insertions(+), 38 deletions(-) diff --git a/Rakefile b/Rakefile index b86891f0..d4365723 100644 --- a/Rakefile +++ b/Rakefile @@ -89,9 +89,8 @@ end def siteify_file(file, front_matter = {}) abort "You seem to have misplaced your #{file} file. I can haz?" unless File.exists?(file) - title = File.read(file).match(/\A# (.*)$/)[1] - output_file = file.sub(/\.markdown\z/, ".md").downcase - slug = File.basename(output_file, ".md") + title = File.read(file).match(/\A# (.*)$/)[1] + slug = File.basename(file, ".markdown").downcase front_matter = front_matter.merge({ "title" => title, "layout" => "docs", @@ -99,7 +98,7 @@ def siteify_file(file, front_matter = {}) "note" => "This file is autogenerated. Edit /#{file} instead." }) contents = "#{front_matter.to_yaml}---\n\n#{content_for(file)}" - File.write("site/_docs/#{output_file}", contents) + File.write("site/_docs/#{slug}.md", contents) end def content_for(file) diff --git a/rake/site.rake b/rake/site.rake index 4efed685..3bff7a16 100644 --- a/rake/site.rake +++ b/rake/site.rake @@ -117,7 +117,7 @@ namespace :site do desc "Copy the contributing file" task :contributing do - siteify_file('CONTRIBUTING.markdown') + siteify_file('.github/CONTRIBUTING.markdown') end desc "Write the site latest_version.txt file" diff --git a/site/_docs/conduct.md b/site/_docs/conduct.md index 6995b911..b5420b47 100644 --- a/site/_docs/conduct.md +++ b/site/_docs/conduct.md @@ -1,7 +1,7 @@ --- redirect_from: "/conduct/index.html" editable: false -title: Contributor Code of Conduct +title: Code of Conduct layout: docs permalink: "/docs/conduct/" note: This file is autogenerated. Edit /CONDUCT.markdown instead. diff --git a/site/_docs/contributing.md b/site/_docs/contributing.md index a5654bdd..51942fab 100644 --- a/site/_docs/contributing.md +++ b/site/_docs/contributing.md @@ -1,7 +1,8 @@ --- -layout: docs title: Contributing -permalink: /docs/contributing/ +layout: docs +permalink: "/docs/contributing/" +note: This file is autogenerated. Edit /.github/CONTRIBUTING.markdown instead. --- So you've got an awesome idea to throw into Jekyll. Great! Please keep the @@ -27,38 +28,29 @@ following in mind: change is to review, the more likely it will be merged. * When submitting a pull request, please make judicious use of the pull request body. A description of what changes were made, the motivations behind the - changes, and [any tasks completed or left to complete](http://git.io/gfm-tasks) + changes and [any tasks completed or left to complete](http://git.io/gfm-tasks) will also speed up review time. -
-
Contributions will not be accepted without tests
-

- If you’re creating a small fix or patch to an existing feature, just - a simple test will do. -

-
- - Test Dependencies ----------------- To run the test suite and build the gem you'll need to install Jekyll's -dependencies. Simply run this command to get all set up: +dependencies. Simply run this command to get all setup: -
$ script/bootstrap
+ $ script/bootstrap Before you start, run the tests and make sure that they pass (to confirm your environment is configured properly): -
$ script/cibuild
+ $ script/cibuild If you are only updating a file in `test/`, you can use the command: -
$ script/test test/blah_test.rb
+ $ script/test test/blah_test.rb If you are only updating a `.feature` file, you can use the command: -
$ script/cucumber features/blah.feature
+ $ script/cucumber features/blah.feature Both `script/test` and `script/cucumber` can be run without arguments to run its entire respective suite. @@ -68,7 +60,7 @@ Workflow Here's the most direct way to get your work merged into the project: -* Fork the project. +* [Fork](https://github.com/jekyll/jekyll/fork) the project. * Clone down your fork ( `git clone git@github.com:[username]/jekyll.git` ). * Create a topic branch to contain your change ( `git checkout -b my_awesome_feature` ). * Hack away, add tests. Not necessarily in that order. @@ -86,18 +78,19 @@ open-sourced our docs and we welcome any pull requests if you find it lacking. You can find the documentation for jekyllrb.com in the -[site]({{ site.repository }}/tree/master/site) directory of +[site](https://github.com/jekyll/jekyll/tree/master/site) directory of Jekyll's repo on GitHub.com. All documentation pull requests should be directed at `master`. Pull requests directed at another branch will not be accepted. -The [Jekyll wiki]({{ site.repository }}/wiki) on GitHub +The [Jekyll wiki](https://github.com/jekyll/jekyll/wiki) on GitHub can be freely updated without a pull request as all GitHub users have access. -If you want to add your plugin to the [list of plugins](/docs/plugins/#available-plugins), -please submit a pull request modifying the [plugins page source -file]({{ site.repository }}/blob/master/site/_docs/plugins.md) by adding a +If you want to add your plugin to the +[list of plugins](http://jekyllrb.com/docs/plugins/#available-plugins), +please submit a pull request modifying the +[plugins page source file](site/_docs/plugins.md) by adding a link to your plugin under the proper subheading depending upon its type. Gotchas @@ -113,12 +106,5 @@ Gotchas Finally... ---------- -
-
Let us know what could be better!
-

- Both using and hacking on Jekyll should be fun, simple, and easy, so if for - some reason you find it’s a pain, please create an issue on - GitHub describing your experience so we can make it better. -

-
+Thanks! Hacking on Jekyll should be fun. If you find any of this hard to figure +out, let us know so we can improve our process or documentation! From 1bc9e0ed632d34083ca5021dcc6d3e6e2e09ced8 Mon Sep 17 00:00:00 2001 From: David Von Lehman Date: Wed, 2 Mar 2016 15:04:15 -0800 Subject: [PATCH 44/52] Adding Aerobatic to list of deployment options --- site/_docs/deployment-methods.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/site/_docs/deployment-methods.md b/site/_docs/deployment-methods.md index c5c4f750..f10b48b7 100644 --- a/site/_docs/deployment-methods.md +++ b/site/_docs/deployment-methods.md @@ -219,3 +219,9 @@ Use [Kickster](http://kickster.nielsenramon.com/) for easy (automated) deploys t Kickster provides a basic Jekyll project setup packed with web best practises and useful optimization tools increasing your overall project quality. Kickster ships with automated and worry-free deployment scripts for GitHub Pages. Setting up Kickster is very easy, just install the gem and you are good to go. More documentation can here found [here](https://github.com/nielsenramon/kickster#kickster). If you do not want to use the gem or start a new project you can just copy paste the deployment scripts for [Travis CI](https://github.com/nielsenramon/kickster/tree/master/snippets/travis) or [Circle CI](https://github.com/nielsenramon/kickster#automated-deployment-with-circle-ci). + +## Aerobatic + +[Aerobatic](https://www.aerobatic.com) is an add-on for Bitbucket that brings GitHub Pages style functionality to Bitbucket users. It includes continuous deployment, custom domains with a wildcard SSL cert, CDN, basic auth, and staging branches all in the box. + +Automating the build and deployment of a Jekyll site is just as simple as GitHub Pages - push your changes to your repo (excluding the `_site` directory) and within seconds a build will be triggered and your built site deployed to our highly- available, globally distributed hosting service. The build process will even install and execute custom Ruby plugins. See our [Jekyll docs](https://www.aerobatic.com/docs/static-generators#jekyll) for more details. From 6262a59be87a5cd9892bede1b30e1661fec4b95f Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 2 Mar 2016 20:05:10 -0800 Subject: [PATCH 45/52] Remove header from History.markdown --- History.markdown | 2 -- 1 file changed, 2 deletions(-) diff --git a/History.markdown b/History.markdown index 7902e446..ea0f5e7e 100644 --- a/History.markdown +++ b/History.markdown @@ -1,5 +1,3 @@ -# History - ## HEAD ### Minor Enhancements From 55edf76590e79ce5828d1f4c5d8b033f5fddb9c7 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 2 Mar 2016 20:06:25 -0800 Subject: [PATCH 46/52] Update history to reflect merge of #4601 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index ea0f5e7e..09f41134 100644 --- a/History.markdown +++ b/History.markdown @@ -18,6 +18,7 @@ * Add project maintainer profile links (#4591) * Fix state leakage in Kramdown test (#4618) + * Unify method for copying special files from repo to site (#4601) ### Site Enhancements From ff91463c43cbf0089b1603ba19b3770a28ca5d73 Mon Sep 17 00:00:00 2001 From: Hugo Giraudel Date: Fri, 4 Mar 2016 17:03:26 +0100 Subject: [PATCH 47/52] Added a default lang attribute --- lib/site_template/_layouts/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/site_template/_layouts/default.html b/lib/site_template/_layouts/default.html index e4ab96fb..f364a368 100644 --- a/lib/site_template/_layouts/default.html +++ b/lib/site_template/_layouts/default.html @@ -1,5 +1,5 @@ - + {% include head.html %} From a416802a896efb09d78b361086638098e41d3cdb Mon Sep 17 00:00:00 2001 From: Jordon Bedwell Date: Fri, 4 Mar 2016 10:27:04 -0600 Subject: [PATCH 48/52] Update history.markdown to reflect the merger of #4633 --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 09f41134..d67f4e6d 100644 --- a/History.markdown +++ b/History.markdown @@ -8,6 +8,7 @@ ### Bug Fixes + * Site Template: Added a default lang attribute (#4633) * 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) From 09b9db259c56236cbe49fb1d0a35e455dab0c90c Mon Sep 17 00:00:00 2001 From: Hugo Giraudel Date: Fri, 4 Mar 2016 17:32:21 +0100 Subject: [PATCH 49/52] Added role="banner" to
--- lib/site_template/_includes/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/site_template/_includes/header.html b/lib/site_template/_includes/header.html index 42d1425b..5043f539 100644 --- a/lib/site_template/_includes/header.html +++ b/lib/site_template/_includes/header.html @@ -1,4 +1,4 @@ -
+