diff --git a/History.markdown b/History.markdown index edb33cd1..a2a116c6 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) @@ -50,6 +51,8 @@ * 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) + * Update the README to reflect the repo move (#1943) ### Site Enhancements * Document Kramdown's GFM parser option (#1791) @@ -69,6 +72,18 @@ * 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) + * 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) + * Update `master` with the release info from 1.4.3 (#1947) + * Define docs nav in datafile (#1953) + +## 1.4.3 / 2014-01-13 + +### Bug Fixes + * Patch show-stopping security vulnerabilities (#1944) ## 1.4.2 / 2013-12-16 diff --git a/README.markdown b/README.markdown index a7961088..813e30bd 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 perfect for personal or project sites. Think of it sort of like a file-based CMS, except without all the complexity. Jekyll takes your content, runs it through Markdown converters and Liquid templates, and spits out a complete, static website suitable for serving with Apache, Nginx 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 on GitHub. diff --git a/jekyll.gemspec b/jekyll.gemspec index 1608ce76..a891f0bb 100644 --- a/jekyll.gemspec +++ b/jekyll.gemspec @@ -24,10 +24,10 @@ 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") + 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") @@ -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 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 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 %} 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.* 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/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 `""`. 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})