From 2351ef6bbe644ba21c633b8d2fd90572d04139f5 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Thu, 28 Jul 2016 14:46:05 -0400 Subject: [PATCH 1/7] dont double sanitize theme folder paths --- lib/jekyll/theme.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/jekyll/theme.rb b/lib/jekyll/theme.rb index 4cd2d163..e402ec05 100644 --- a/lib/jekyll/theme.rb +++ b/lib/jekyll/theme.rb @@ -34,11 +34,8 @@ module Jekyll private def path_for(folder) - resolved_dir = realpath_for(folder) - return unless resolved_dir - - path = Jekyll.sanitized_path(root, resolved_dir) - path if File.directory?(path) + path = realpath_for(folder) + path if path && File.directory?(path) end def realpath_for(folder) From 8b69c6f0b5ad8c6d94c782c559028db4985a4704 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Thu, 28 Jul 2016 15:12:31 -0400 Subject: [PATCH 2/7] resolve theme root before sanitizing --- lib/jekyll/theme.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/theme.rb b/lib/jekyll/theme.rb index e402ec05..0dd73f78 100644 --- a/lib/jekyll/theme.rb +++ b/lib/jekyll/theme.rb @@ -10,7 +10,11 @@ module Jekyll end def root - @root ||= gemspec.full_gem_path + # Must use File.realpath to resolve symlinks created by rbenv + # Otherwise, Jekyll.sanitized path with prepend the unresolved root + @root ||= File.realpath(gemspec.full_gem_path) + rescue Errno::ENOENT, Errno::EACCES, Errno::ELOOP + nil end def includes_path From 65d1dc48f3f96787a1c5e57a6a32445225748228 Mon Sep 17 00:00:00 2001 From: Daniel Chapman Date: Mon, 1 Aug 2016 11:05:12 +0900 Subject: [PATCH 3/7] Future True on GitHub Pages note --- site/_docs/upgrading/2-to-3.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/site/_docs/upgrading/2-to-3.md b/site/_docs/upgrading/2-to-3.md index f9390a21..3d15ec55 100644 --- a/site/_docs/upgrading/2-to-3.md +++ b/site/_docs/upgrading/2-to-3.md @@ -65,6 +65,14 @@ In Jekyll 3, this has been corrected. **Now, `--future` is disabled by default.* This means you will need to include `--future` if you want your future-dated posts to generate when running `jekyll build` or `jekyll serve`. +
+
Future Posts on GitHub Pages
+

+ An exception to the above rule are GitHub Pages sites, where the `--future` flag remains _enabled_ + by default to maintain historical consistency for those sites. +

+
+ ### Layout metadata Introducing: `layout`. In Jekyll 2 and below, any metadata in the layout was merged onto From c5bd075bc748facf9eb2e9ad23fda62e9a205ccc Mon Sep 17 00:00:00 2001 From: Gary Ewan Park Date: Mon, 1 Aug 2016 19:20:59 +0100 Subject: [PATCH 4/7] Minor updates and corrections - Corrected highlighting on multi-line sections - Replace `cinst` with `choco install` for consistency --- site/_docs/windows.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/site/_docs/windows.md b/site/_docs/windows.md index 72f0029e..d4189aed 100644 --- a/site/_docs/windows.md +++ b/site/_docs/windows.md @@ -75,13 +75,13 @@ This gem is also needed in the github-pages and to get it running on Windows x64 **Note:** In the current [pre release][nokogiriFails] it works out of the box with Windows x64 but this version is not referenced in the github-pages. -`cinst -Source "https://go.microsoft.com/fwlink/?LinkID=230477" libxml2`{:.language-ruby} +`choco install libxml2 -Source "https://www.nuget.org/api/v2/"`{:.language-ruby} -`cinst -Source "https://go.microsoft.com/fwlink/?LinkID=230477" libxslt`{:.language-ruby} +`choco install libxslt -Source "https://www.nuget.org/api/v2/"`{:.language-ruby} -`cinst -Source "https://go.microsoft.com/fwlink/?LinkID=230477" libiconv`{:.language-ruby} +`choco install libiconv -Source "https://www.nuget.org/api/v2/"`{:.language-ruby} -```language-ruby +{% highlight ruby %} gem install nokogiri --^ --with-xml2-include=C:\Chocolatey\lib\libxml2.2.7.8.7\build\native\include^ --with-xml2-lib=C:\Chocolatey\lib\libxml2.redist.2.7.8.7\build\native\bin\v110\x64\Release\dynamic\cdecl^ @@ -89,7 +89,7 @@ This gem is also needed in the github-pages and to get it running on Windows x64 --with-iconv-lib=C:\Chocolatey\lib\libiconv.redist.1.14.0.11\build\native\bin\v110\x64\Release\dynamic\cdecl^ --with-xslt-include=C:\Chocolatey\lib\libxslt.1.1.28.0\build\native\include^ --with-xslt-lib=C:\Chocolatey\lib\libxslt.redist.1.1.28.0\build\native\bin\v110\x64\Release\dynamic -``` +{% endhighlight %} #### Install github-pages @@ -98,10 +98,10 @@ This gem is also needed in the github-pages and to get it running on Windows x64 * Copy & past the two lines into the file: -```language-ruby +{% highlight ruby %} source 'http://rubygems.org' gem 'github-pages' -``` +{% endhighlight %} * **Note:** We use an unsecure connection because SSL throws exceptions in the version of Ruby * Open a command prompt, target your local blog repository root, and install github-pages: `bundle install` From 26b827a53660e9703733d38305650957cb673e46 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 1 Aug 2016 13:14:07 -0700 Subject: [PATCH 5/7] Update history to reflect merge of #5173 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 84a1b586..94d1a9f1 100644 --- a/History.markdown +++ b/History.markdown @@ -5,6 +5,7 @@ * Enable site excerpts (#5150) * Initial 404 page (#5143) * Remove the "this feature is unreleased" warning from the theme docs (#5158) + * Future True on GitHub Pages note (#5173) ### Bug Fixes From e735e451563c50bfb94beb55847cd45882e624e7 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 1 Aug 2016 17:25:44 -0700 Subject: [PATCH 6/7] Update history to reflect merge of #5177 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 94d1a9f1..17779ec4 100644 --- a/History.markdown +++ b/History.markdown @@ -6,6 +6,7 @@ * Initial 404 page (#5143) * Remove the "this feature is unreleased" warning from the theme docs (#5158) * Future True on GitHub Pages note (#5173) + * Minor updates and corrections (#5177) ### Bug Fixes From 854048799799b98812540c4b093805f1b673a272 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 1 Aug 2016 17:27:02 -0700 Subject: [PATCH 7/7] Update history to reflect merge of #5156 [ci skip] --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 17779ec4..f2575649 100644 --- a/History.markdown +++ b/History.markdown @@ -11,6 +11,7 @@ ### Bug Fixes * Include theme directories in default gemspec (#5152) + * Fix for symlinked themes (#5156) ## 3.2.0 / 2016-07-26