Merge branch 'master' into vision

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 `<p>` 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
 

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.
 

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

script/bootstrap

@@ -1,2 +1,4 @@
 #!/bin/sh
+
+script/branding
 bundle install

script/branding

@@ -0,0 +1,11 @@
+#! /bin/bash
+
+echo " ---------------------------------------------------------- "
+echo "          _   ______   _  __ __     __  _        _          "
+echo "         | | |  ____| | |/ / \ \   / / | |      | |         "
+echo "         | | | |__    | ' /   \ \_/ /  | |      | |         "
+echo "     _   | | |  __|   |  <     \   /   | |      | |         "
+echo "    | |__| | | |____  | . \     | |    | |____  | |____     "
+echo "     \____/  |______| |_|\_\    |_|    |______| |______|    "
+echo "                                                            "
+echo " ---------------------------------------------------------- "

script/cibuild

@@ -1,4 +1,5 @@
 #! /bin/bash
 
-script/bootstrap
+script/branding
+script/bootstrap > /dev/null 2>&1
 bundle exec rake

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

site/_includes/docs_contents.html

@@ -1,16 +1,8 @@
 <div class="unit one-fifth hide-on-mobiles">
   <aside>
-    <h4>Getting Started</h4>
+    {% for section in site.data.docs %}
-    {% include docs_ul.html items='home quickstart installation usage structure configuration' %}
+    <h4>{{ section.title }}</h4>
-    <h4>Your Content</h4>
+    {% include docs_ul.html items=section.docs %}
-    {% include docs_ul.html items='frontmatter posts drafts pages variables datafiles migrations' %}
+    {% endfor %}
-    <h4>Customization</h4>
-    {% include docs_ul.html items='templates permalinks pagination plugins extras' %}
-    <h4>Deployment</h4>
-    {% include docs_ul.html items='github-pages deployment-methods' %}
-    <h4>Miscellaneous</h4>
-    {% include docs_ul.html items='troubleshooting sites resources upgrading' %}
-    <h4>Meta</h4>
-    {% include docs_ul.html items='contributing history' %}
   </aside>
 </div>

site/_includes/docs_contents_mobile.html

@@ -1,23 +1,10 @@
 <div class="docs-nav-mobile unit whole show-on-mobiles">
   <select onchange="if (this.value) window.location.href=this.value">
     <option value="">Navigate the docs…</option>
-    <optgroup label="Getting started">
+    {% for section in site.data.docs %}
-      {% include docs_option.html items='home quickstart installation usage structure configuration' %}
+    <optgroup label="{{ section.title }}">
-    </optgroup>
+      {% include docs_option.html items=section.docs %}
-    <optgroup label="Your Content">
-      {% include docs_option.html items='frontmatter posts drafts pages variables datafiles migrations' %}
-    </optgroup>
-    <optgroup label="Customization">
-      {% include docs_option.html items='templates permalinks pagination plugins extras' %}
-    </optgroup>
-    <optgroup label="Deployment">
-      {% include docs_option.html items='github-pages deployment-methods' %}
-    </optgroup>
-    <optgroup label="Miscellaneous">
-      {% include docs_option.html items='troubleshooting sites resources upgrading' %}
-    </optgroup>
-    <optgroup label="Meta">
-      {% include docs_option.html items='contributing history' %}
     </optgroup>
+    {% endfor %}
   </select>
 </div>

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:'/' %}

site/_includes/docs_ul.html

@@ -1,4 +1,4 @@
-{% assign items = include.items | split: ' ' %}
+{% assign items = include.items %}
 
 <ul>
 {% for item in items %}

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.*

site/docs/configuration.md

@@ -67,7 +67,7 @@ class="flag">flags</code> (specified on the command-line) that control them.
         <p class="description">
           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.
         </p>
       </td>
       <td class='align-center'>

site/docs/posts.md

@@ -138,12 +138,19 @@ posts:
   {% raw %}{% for post in site.posts %}{% endraw %}
     <li>
       <a href="{% raw %}{{ post.url }}{% endraw %}">{% raw %}{{ post.title }}{% endraw %}</a>
-      <p>{% raw %}{{ post.excerpt }}{% endraw %}</p>
+      {% raw %}{{ post.excerpt }}{% endraw %}
     </li>
   {% raw %}{% endfor %}{% endraw %}
 </ul>
 {% 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: '<p>' | remove: '</p>' }}{% 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 `""`.

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})