From b053a1edf1d0d85e30c8eb615f8973c9737ee987 Mon Sep 17 00:00:00 2001 From: Rob Muhlestein Date: Sun, 12 Jan 2014 13:52:14 -0800 Subject: [PATCH 01/20] Add note in Posts docs about stripping

tags from excerpt. Fixes #1926. Merges #1933. --- site/docs/posts.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/site/docs/posts.md b/site/docs/posts.md index 8adb1d8e..f93eb6b5 100644 --- a/site/docs/posts.md +++ b/site/docs/posts.md @@ -138,12 +138,19 @@ posts: {% raw %}{% for post in site.posts %}{% endraw %}

  • {% raw %}{{ post.title }}{% endraw %} -

    {% raw %}{{ post.excerpt }}{% endraw %}

    + {% raw %}{{ post.excerpt }}{% endraw %}
    • {% raw %}{% endfor %}{% endraw %} {% endhighlight %} +Because Jekyll grabs the first paragraph you will not need to wrap the excerpt in `p` tags, +which is already done for you. These tags can be removed with the following if you'd prefer: + +{% highlight html %} +{% raw %}{{ post.excerpt | remove: '

    ' | remove: '

    ' }}{% endraw %} +{% endhighlight %} + If you don't like the automatically-generated post excerpt, it can be overridden by adding `excerpt` to your post's YAML front-matter. Completely disable it by setting your `excerpt_separator` to `""`. From f8c904908add291e1c9dacc45883cc21b01cc0c3 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 12 Jan 2014 13:53:56 -0800 Subject: [PATCH 02/20] Update history to reflect merge of #1933. [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index edb33cd1..1c84a27d 100644 --- a/History.markdown +++ b/History.markdown @@ -69,6 +69,7 @@ * Add a charset note in "Writing Posts" doc page (#1902) * Disallow selection of path and prompt in bash examples * Add jekyll-compass to the plugin list (#1923) + * Add note in Posts docs about stripping `

    ` tags from excerpt (#1933) ## 1.4.2 / 2013-12-16 From 21cef96b5de395f109dd39ef36cc141a4de2fca4 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 12 Jan 2014 14:44:40 -0800 Subject: [PATCH 03/20] Branding, baby. Many thanks to http://patorjk.com/software/taag/ for doing the ASCII art. :smiley: --- script/bootstrap | 2 ++ script/branding | 11 +++++++++++ script/cibuild | 3 ++- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100755 script/branding diff --git a/script/bootstrap b/script/bootstrap index da4e3ef6..097f3e27 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -1,2 +1,4 @@ #!/bin/sh + +script/branding bundle install diff --git a/script/branding b/script/branding new file mode 100755 index 00000000..2df6c670 --- /dev/null +++ b/script/branding @@ -0,0 +1,11 @@ +#! /bin/bash + +echo " ---------------------------------------------------------- " +echo " _ ______ _ __ __ __ _ _ " +echo " | | | ____| | |/ / \ \ / / | | | | " +echo " | | | |__ | ' / \ \_/ / | | | | " +echo " _ | | | __| | < \ / | | | | " +echo " | |__| | | |____ | . \ | | | |____ | |____ " +echo " \____/ |______| |_|\_\ |_| |______| |______| " +echo " " +echo " ---------------------------------------------------------- " diff --git a/script/cibuild b/script/cibuild index 02d68677..1dc4a237 100755 --- a/script/cibuild +++ b/script/cibuild @@ -1,4 +1,5 @@ #! /bin/bash -script/bootstrap +script/branding +script/bootstrap > /dev/null 2>&1 bundle exec rake From 0d6db1613f5bc251ef56e164890ef98fda2ff309 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Sun, 12 Jan 2014 21:30:18 -0800 Subject: [PATCH 04/20] Update history to reflect merge of #1936 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 1c84a27d..2b24a9eb 100644 --- a/History.markdown +++ b/History.markdown @@ -50,6 +50,7 @@ * Use `Forwardable` for delegation between `Excerpt` and `Post` (#1927) * Rename `read_things` to `read_content` (#1928) + * Add `script/branding` script for ASCII art lovin' (#1936) ### Site Enhancements * Document Kramdown's GFM parser option (#1791) From 2966606b1a5d473d50da4113bbcc02a70b510e26 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 13 Jan 2014 00:17:12 -0800 Subject: [PATCH 05/20] Add docs about the 'new' restriction on excludes. --- site/docs/configuration.md | 2 +- test/test_entry_filter.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/site/docs/configuration.md b/site/docs/configuration.md index 10f5b10c..8ca54f86 100644 --- a/site/docs/configuration.md +++ b/site/docs/configuration.md @@ -67,7 +67,7 @@ class="flag">flags (specified on the command-line) that control them.

    Exclude directories and/or files from the conversion. These exclusions are relative to the site's - source directory. + source directory and cannot be outside the source directory.

    diff --git a/test/test_entry_filter.rb b/test/test_entry_filter.rb index ce50b6a8..aea09601 100644 --- a/test/test_entry_filter.rb +++ b/test/test_entry_filter.rb @@ -72,7 +72,7 @@ class TestEntryFilter < Test::Unit::TestCase end end - context "glob_include?" do + context "#glob_include?" do setup do stub(Jekyll).configuration do Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir}) From 2c2beb9c1fb1e58048d8e6f477e07688f21e6c11 Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Mon, 13 Jan 2014 09:15:54 -0600 Subject: [PATCH 06/20] Update history to reflect merge of #1938 --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 2b24a9eb..2c0fdb3b 100644 --- a/History.markdown +++ b/History.markdown @@ -71,6 +71,7 @@ * Disallow selection of path and prompt in bash examples * Add jekyll-compass to the plugin list (#1923) * Add note in Posts docs about stripping `

    ` tags from excerpt (#1933) + * Add additional info about the new exclude behavior (#1938) ## 1.4.2 / 2013-12-16 From 5aeb2733a107ee32af43870ce47ec3d09ce025f5 Mon Sep 17 00:00:00 2001 From: Rob McGuire-Dale Date: Mon, 13 Jan 2014 10:19:05 -0800 Subject: [PATCH 07/20] Add link to contributors in README. Linkify "awesome contributors" in the README, as in the footer of the [Jekyll home page](http://jekyllrb.com/). --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index 05ade2f9..f56cb4ca 100644 --- a/README.markdown +++ b/README.markdown @@ -7,7 +7,7 @@ [![Dependency Status](https://gemnasium.com/jekyll/jekyll.png)](https://gemnasium.com/jekyll/jekyll) [![Coverage Status](https://coveralls.io/repos/jekyll/jekyll/badge.png)](https://coveralls.io/r/jekyll/jekyll) -By Tom Preston-Werner, Nick Quaranto, and many awesome contributors! +By Tom Preston-Werner, Nick Quaranto, and many [awesome contributors](https://github.com/jekyll/jekyll/graphs/contributors)! Jekyll is a simple, blog aware, static site generator. It takes a template directory (representing the raw form of a website), runs it through Textile or Markdown and Liquid converters, and spits out a complete, static website suitable for serving with Apache or your favorite web server. This is also the engine behind [GitHub Pages](http://pages.github.com), which you can use to host your project's page or blog right here from GitHub. From 750a56d1feec99e611aeb1124b87aa14b34916ac Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Mon, 13 Jan 2014 13:13:29 -0600 Subject: [PATCH 08/20] Update history to reflect merge of #1940 --- History.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/History.markdown b/History.markdown index 2c0fdb3b..9145f044 100644 --- a/History.markdown +++ b/History.markdown @@ -72,6 +72,8 @@ * Add jekyll-compass to the plugin list (#1923) * Add note in Posts docs about stripping `

    ` tags from excerpt (#1933) * Add additional info about the new exclude behavior (#1938) + * Linkify 'awesome contributors' to point to the contributors graph on + GitHub (#1940) ## 1.4.2 / 2013-12-16 From edc9ffcb6518c4a21d6256023670492089244c84 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 13 Jan 2014 22:26:38 -0800 Subject: [PATCH 09/20] Add 1.4.3 release post by @BenBalter for master branch. --- .../2014-01-13-jekyll-1-4-3-released.markdown | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 site/_posts/2014-01-13-jekyll-1-4-3-released.markdown diff --git a/site/_posts/2014-01-13-jekyll-1-4-3-released.markdown b/site/_posts/2014-01-13-jekyll-1-4-3-released.markdown new file mode 100644 index 00000000..a97bcec4 --- /dev/null +++ b/site/_posts/2014-01-13-jekyll-1-4-3-released.markdown @@ -0,0 +1,26 @@ +--- +layout: news_item +title: 'Jekyll 1.4.3 Released' +date: 2014-01-13 17:43:32 -0800 +author: benbalter +version: 1.4.3 +categories: [release] +--- + +Jekyll 1.4.3 contains two **critical** security fixes. If you run Jekyll locally +and do not run Jekyll in "safe" mode (e.g. you do not build Jekyll sites on behalf +of others), you are not affected and are not required to update at this time. +([See pull request.]({{ site.repository }}/pull/1944)) + +Versions of Jekyll prior to 1.4.3 and greater than 1.2.0 may allow malicious +users to expose the content of files outside the source directory in the +generated output via improper symlink sanitization, potentially resulting in an +inadvertent information disclosure. + +Versions of Jekyll prior to 1.4.3 may also allow malicious users to write +arbitrary `.html` files outside of the destination folder via relative path +traversal, potentially overwriting otherwise-trusted content with arbitrary HTML +or Javascript depending on your server's configuration. + +*Maintainer's note: Many thanks to @gregose and @charliesome for discovering +these vulnerabilities, and to @BenBalter and @alindeman for writing the patch.* From e87cd8d53ce979861070af11345e21d7f121e6f1 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 13 Jan 2014 22:27:41 -0800 Subject: [PATCH 10/20] Update History.markdown with 1.4.3 release. --- History.markdown | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/History.markdown b/History.markdown index 9145f044..26df264c 100644 --- a/History.markdown +++ b/History.markdown @@ -75,6 +75,11 @@ * Linkify 'awesome contributors' to point to the contributors graph on GitHub (#1940) +## 1.4.3 / 2014-01-13 + +### Bug Fixes + * Patch show-stopping security vulnerabilities (#1944) + ## 1.4.2 / 2013-12-16 ### Bug Fixes From 245597c2dbe0efb5f72c11b14fdc96c3fa5d4b5a Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Mon, 13 Jan 2014 22:28:16 -0800 Subject: [PATCH 11/20] Require Liquid 2.5.5 <= x < 2.6 --- jekyll.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jekyll.gemspec b/jekyll.gemspec index 1608ce76..7fe6c10d 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -24,7 +24,7 @@ Gem::Specification.new do |s| s.rdoc_options = ["--charset=UTF-8"] s.extra_rdoc_files = %w[README.markdown LICENSE] - s.add_runtime_dependency('liquid', "~> 2.5.2") + s.add_runtime_dependency('liquid', "~> 2.5.5") s.add_runtime_dependency('classifier', "~> 1.3") s.add_runtime_dependency('listen', "~> 1.3") s.add_runtime_dependency('maruku', "~> 0.7.0") From 45c0523e553e9fb270746175a5cf5fea009f9a78 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 14 Jan 2014 08:43:29 -0800 Subject: [PATCH 12/20] update dat gemspec --- jekyll.gemspec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/jekyll.gemspec b/jekyll.gemspec index 7fe6c10d..e3d74185 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -128,6 +128,8 @@ Gem::Specification.new do |s| lib/site_template/css/syntax.css lib/site_template/index.html script/bootstrap + script/branding + script/cibuild site/.gitignore site/CNAME site/README @@ -167,6 +169,9 @@ Gem::Specification.new do |s| site/_posts/2013-11-04-jekyll-1-3-0-released.markdown site/_posts/2013-11-26-jekyll-1-3-1-released.markdown site/_posts/2013-12-07-jekyll-1-4-0-released.markdown + site/_posts/2013-12-09-jekyll-1-4-1-released.markdown + site/_posts/2013-12-16-jekyll-1-4-2-released.markdown + site/_posts/2014-01-13-jekyll-1-4-3-released.markdown site/css/screen.css site/docs/configuration.md site/docs/contributing.md @@ -195,6 +200,7 @@ Gem::Specification.new do |s| site/docs/upgrading.md site/docs/usage.md site/docs/variables.md + site/docs/windows.md site/favicon.png site/feed.xml site/freenode.txt @@ -221,6 +227,7 @@ Gem::Specification.new do |s| test/source/_data/languages.yml test/source/_data/members.yaml test/source/_data/products.yml + test/source/_includes/include.html test/source/_includes/params.html test/source/_includes/sig.markdown test/source/_layouts/default.html @@ -260,6 +267,8 @@ Gem::Specification.new do |s| test/source/_posts/2013-05-10-number-category.textile test/source/_posts/2013-07-22-post-excerpt-with-layout.markdown test/source/_posts/2013-08-01-mkdn-extension.mkdn + test/source/_posts/2013-12-17-include-variable-filters.markdown + test/source/_posts/2013-12-20-properties.text test/source/_posts/es/2008-11-21-nested.textile test/source/about.html test/source/category/_posts/2008-9-23-categories.textile @@ -271,6 +280,7 @@ Gem::Specification.new do |s| test/source/foo/_posts/bar/2008-12-12-topical-post.textile test/source/index.html test/source/products.yml + test/source/properties.html test/source/sitemap.xml test/source/symlink-test/_data test/source/symlink-test/symlinked-dir From dc599121a07e31c736c2d0bf44fffe9a3a9d8401 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 14 Jan 2014 08:43:53 -0800 Subject: [PATCH 13/20] Update history to reflect merge of #1943 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 9145f044..787f8a52 100644 --- a/History.markdown +++ b/History.markdown @@ -51,6 +51,7 @@ (#1927) * Rename `read_things` to `read_content` (#1928) * Add `script/branding` script for ASCII art lovin' (#1936) + * Update the README to reflect the repo move ### Site Enhancements * Document Kramdown's GFM parser option (#1791) From b3064a9b7dda641564e525f8a0737a25b1a322bd Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 14 Jan 2014 08:44:20 -0800 Subject: [PATCH 14/20] Forgot #1943 in the line, whoopsie --- History.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/History.markdown b/History.markdown index 787f8a52..01c820ad 100644 --- a/History.markdown +++ b/History.markdown @@ -51,7 +51,7 @@ (#1927) * Rename `read_things` to `read_content` (#1928) * Add `script/branding` script for ASCII art lovin' (#1936) - * Update the README to reflect the repo move + * Update the README to reflect the repo move (#1943) ### Site Enhancements * Document Kramdown's GFM parser option (#1791) From ea94e5dd1cffe3fe7ba1cf480ad7415214b2ca50 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Tue, 14 Jan 2014 08:56:28 -0800 Subject: [PATCH 15/20] Update history to reflect merge of #1949 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 01c820ad..f57a3da1 100644 --- a/History.markdown +++ b/History.markdown @@ -75,6 +75,7 @@ * Add additional info about the new exclude behavior (#1938) * Linkify 'awesome contributors' to point to the contributors graph on GitHub (#1940) + * Update `docs/sites.md` link to GitHub Training materials (#1949) ## 1.4.2 / 2013-12-16 From 7f3b35191c541ed8dae36b38ef24d4538ab52d17 Mon Sep 17 00:00:00 2001 From: Troy Swanson Date: Tue, 14 Jan 2014 21:48:08 -0600 Subject: [PATCH 16/20] Make doc menus more reusable --- site/_data/docs.yml | 43 ++++++++++++++++++++++++ site/_includes/docs_contents.html | 16 +++------ site/_includes/docs_contents_mobile.html | 21 +++--------- site/_includes/docs_option.html | 2 +- site/_includes/docs_ul.html | 4 +-- 5 files changed, 54 insertions(+), 32 deletions(-) create mode 100644 site/_data/docs.yml diff --git a/site/_data/docs.yml b/site/_data/docs.yml new file mode 100644 index 00000000..4e89bcb2 --- /dev/null +++ b/site/_data/docs.yml @@ -0,0 +1,43 @@ +- title: Getting Started + docs: + - home + - quickstart + - installation + - usage + - structure + - configuration + +- title: Your Content + docs: + - frontmatter + - posts + - drafts + - pages + - variables + - datafiles + - migrations + +- title: Customization + docs: + - templates + - permalinks + - pagination + - plugins + - extras + +- title: Deployment + docs: + - github-pages + - deployment-methods + +- title: Miscellaneous + docs: + - troubleshooting + - sites + - resources + - upgrading + +- title: Meta + docs: + - contributing + - history diff --git a/site/_includes/docs_contents.html b/site/_includes/docs_contents.html index 523b5227..2ac64bb4 100644 --- a/site/_includes/docs_contents.html +++ b/site/_includes/docs_contents.html @@ -1,16 +1,8 @@

    diff --git a/site/_includes/docs_contents_mobile.html b/site/_includes/docs_contents_mobile.html index bbc367d4..b3e0110c 100644 --- a/site/_includes/docs_contents_mobile.html +++ b/site/_includes/docs_contents_mobile.html @@ -1,23 +1,10 @@
    diff --git a/site/_includes/docs_option.html b/site/_includes/docs_option.html index 8284ed96..a1e29cac 100644 --- a/site/_includes/docs_option.html +++ b/site/_includes/docs_option.html @@ -1,4 +1,4 @@ -{% assign items = include.items | split: ' ' %} +{% assign items = include.items %} {% for item in items %} {% assign item_url = item | prepend:'/docs/' | append:'/' %} diff --git a/site/_includes/docs_ul.html b/site/_includes/docs_ul.html index 4ba82479..99ac26ef 100644 --- a/site/_includes/docs_ul.html +++ b/site/_includes/docs_ul.html @@ -1,4 +1,4 @@ -{% assign items = include.items | split: ' ' %} +{% assign items = include.items %}
      {% for item in items %} @@ -16,5 +16,5 @@ {% endif %} {% endfor %} -{% endfor %} +{% endfor %}
    From 0be62fa2e033658624fd4a538db10740ccead6ae Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Wed, 15 Jan 2014 22:13:31 -0600 Subject: [PATCH 17/20] Update history to reflect merge of #1947 --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index fc8d4486..767eb4ad 100644 --- a/History.markdown +++ b/History.markdown @@ -76,6 +76,7 @@ * Linkify 'awesome contributors' to point to the contributors graph on GitHub (#1940) * Update `docs/sites.md` link to GitHub Training materials (#1949) + * Update `master` with the release info from 1.4.3 (#1947) ## 1.4.3 / 2014-01-13 From 3b485b449702da21550452e960148abf5a3a4c6f Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Wed, 15 Jan 2014 23:11:27 -0600 Subject: [PATCH 18/20] Lock Maruku to 0.7.0 This fixes the errors we see in our tests due to the upgrade to Maruku 0.7.1 --- jekyll.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jekyll.gemspec b/jekyll.gemspec index e3d74185..a891f0bb 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -27,7 +27,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency('liquid', "~> 2.5.5") s.add_runtime_dependency('classifier', "~> 1.3") s.add_runtime_dependency('listen', "~> 1.3") - s.add_runtime_dependency('maruku', "~> 0.7.0") + s.add_runtime_dependency('maruku', "0.7.0") s.add_runtime_dependency('pygments.rb', "~> 0.5.0") s.add_runtime_dependency('mercenary', "~> 0.2.0") s.add_runtime_dependency('safe_yaml', "~> 1.0") From 8337cbb31ff6d384bce5919cda7f1e7cdb12c0e8 Mon Sep 17 00:00:00 2001 From: Matt Rogers Date: Wed, 15 Jan 2014 23:24:24 -0600 Subject: [PATCH 19/20] Update history to reflect merge of #1958 --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 767eb4ad..8ac542da 100644 --- a/History.markdown +++ b/History.markdown @@ -38,6 +38,7 @@ * Change short opts for host and port for `jekyll docs` to be consistent with other subcommands (#1877) * Fix typos (#1910) + * Lock Maruku at 0.7.0 to prevent bugs caused by Maruku 0.7.1 (#1958) ### Development Fixes * Add a link to the site in the README.md file (#1795) From e7139cbd8572e7c6f5d9dc1023197333a54882d3 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Wed, 15 Jan 2014 23:40:17 -0800 Subject: [PATCH 20/20] Update history to reflect merge of #1953 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 8ac542da..a2a116c6 100644 --- a/History.markdown +++ b/History.markdown @@ -78,6 +78,7 @@ GitHub (#1940) * Update `docs/sites.md` link to GitHub Training materials (#1949) * Update `master` with the release info from 1.4.3 (#1947) + * Define docs nav in datafile (#1953) ## 1.4.3 / 2014-01-13