From ec16ea78bd559757ce49f9e8b7030f25fa003122 Mon Sep 17 00:00:00 2001 From: Hubot Date: Thu, 24 Aug 2017 19:01:51 -0500 Subject: [PATCH 01/31] Bump jekyll :gem: to v3.6.0 --- lib/github-pages/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index e3003960..47a34fed 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -7,7 +7,7 @@ module GitHubPages class Dependencies VERSIONS = { # Jekyll - "jekyll" => "3.5.2", + "jekyll" => "3.6.0", "jekyll-sass-converter" => "1.5.0", # Converters From 0a19d2d717dcb2951ecfbb5272113e15ed2aa949 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 24 Aug 2017 20:02:47 -0400 Subject: [PATCH 02/31] Update dependencies.rb --- lib/github-pages/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index 47a34fed..2fbdc5d8 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -7,7 +7,7 @@ module GitHubPages class Dependencies VERSIONS = { # Jekyll - "jekyll" => "3.6.0", + "jekyll" => "3.6.0.pre.beta1", "jekyll-sass-converter" => "1.5.0", # Converters From 5174eb9093cab7e24fbd8d8f0c18001c120febc6 Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Thu, 24 Aug 2017 20:16:49 -0400 Subject: [PATCH 03/31] kramdown 1.14 --- lib/github-pages/dependencies.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb index 2fbdc5d8..cb23136d 100644 --- a/lib/github-pages/dependencies.rb +++ b/lib/github-pages/dependencies.rb @@ -11,7 +11,7 @@ class Dependencies "jekyll-sass-converter" => "1.5.0", # Converters - "kramdown" => "1.13.2", + "kramdown" => "1.14.0", # Misc "liquid" => "4.0.0", From 642124ba3b8250a5a5cb1b00185f57ef2f1545f2 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Thu, 31 Aug 2017 17:02:04 -0400 Subject: [PATCH 04/31] add basic integration tests --- .rspec | 1 + spec/fixtures/Gemfile | 5 + spec/fixtures/_config.yml | 8 + spec/fixtures/_layouts/page.md | 4 + spec/fixtures/_posts/2017-01-10-test.md | 4 + spec/fixtures/index.html | 6 + spec/fixtures/jekyll-avatar.html | 4 + spec/fixtures/jekyll-coffeescript.coffee | 4 + spec/fixtures/jekyll-default-layout.md | 4 + spec/fixtures/jekyll-gist.md | 4 + spec/fixtures/jekyll-github-metadata.html | 4 + spec/fixtures/jekyll-mentions.md | 4 + spec/fixtures/jekyll-optional-front-matter.md | 1 + spec/fixtures/jekyll-readme-index/README.md | 1 + spec/fixtures/jekyll-relative-links.md | 5 + spec/fixtures/jekyll-sass-converter.scss | 8 + spec/fixtures/jekyll-seo-tag.html | 5 + spec/fixtures/jekyll-titles-from-headings.md | 6 + spec/fixtures/jekyll.md | 4 + spec/fixtures/jemoji.md | 4 + spec/fixtures/kramdown.md | 4 + spec/fixtures/liquid.html | 5 + spec/fixtures/redirect_from.html | 3 + spec/fixtures/redirect_to.html | 3 + spec/fixtures/rouge.md | 6 + spec/github-pages/integration_spec.rb | 215 ++++++++++++++++++ spec/spec_helper.rb | 9 +- 27 files changed, 329 insertions(+), 2 deletions(-) create mode 100644 spec/fixtures/Gemfile create mode 100644 spec/fixtures/_layouts/page.md create mode 100644 spec/fixtures/_posts/2017-01-10-test.md create mode 100644 spec/fixtures/index.html create mode 100644 spec/fixtures/jekyll-avatar.html create mode 100644 spec/fixtures/jekyll-coffeescript.coffee create mode 100644 spec/fixtures/jekyll-default-layout.md create mode 100644 spec/fixtures/jekyll-gist.md create mode 100644 spec/fixtures/jekyll-github-metadata.html create mode 100644 spec/fixtures/jekyll-mentions.md create mode 100644 spec/fixtures/jekyll-optional-front-matter.md create mode 100644 spec/fixtures/jekyll-readme-index/README.md create mode 100644 spec/fixtures/jekyll-relative-links.md create mode 100644 spec/fixtures/jekyll-sass-converter.scss create mode 100644 spec/fixtures/jekyll-seo-tag.html create mode 100644 spec/fixtures/jekyll-titles-from-headings.md create mode 100644 spec/fixtures/jekyll.md create mode 100644 spec/fixtures/jemoji.md create mode 100644 spec/fixtures/kramdown.md create mode 100644 spec/fixtures/liquid.html create mode 100644 spec/fixtures/redirect_from.html create mode 100644 spec/fixtures/redirect_to.html create mode 100644 spec/fixtures/rouge.md create mode 100644 spec/github-pages/integration_spec.rb diff --git a/.rspec b/.rspec index 5f164763..2559e39f 100644 --- a/.rspec +++ b/.rspec @@ -1,2 +1,3 @@ --color --format progress +--require spec_helper diff --git a/spec/fixtures/Gemfile b/spec/fixtures/Gemfile new file mode 100644 index 00000000..7fe62b23 --- /dev/null +++ b/spec/fixtures/Gemfile @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +gem "github-pages", :group => :jekyll_plugins, :path => "../../" diff --git a/spec/fixtures/_config.yml b/spec/fixtures/_config.yml index f72783a5..7222eab9 100644 --- a/spec/fixtures/_config.yml +++ b/spec/fixtures/_config.yml @@ -2,5 +2,13 @@ some_key: some_value safe: false gems: - jekyll-sitemap + - jekyll-redirect-from + - jekyll-feed + - jekyll-paginate + - jekyll-seo-tag + - jekyll-avatar + - jemoji + - jekyll-mentions - jekyll_test_plugin_malicious quiet: false +paginate: 5 diff --git a/spec/fixtures/_layouts/page.md b/spec/fixtures/_layouts/page.md new file mode 100644 index 00000000..801832c7 --- /dev/null +++ b/spec/fixtures/_layouts/page.md @@ -0,0 +1,4 @@ +--- +--- + +{{ content }} diff --git a/spec/fixtures/_posts/2017-01-10-test.md b/spec/fixtures/_posts/2017-01-10-test.md new file mode 100644 index 00000000..27701318 --- /dev/null +++ b/spec/fixtures/_posts/2017-01-10-test.md @@ -0,0 +1,4 @@ +--- +--- + +# test diff --git a/spec/fixtures/index.html b/spec/fixtures/index.html new file mode 100644 index 00000000..74a4fbed --- /dev/null +++ b/spec/fixtures/index.html @@ -0,0 +1,6 @@ +--- +--- + +Page: {{ paginator.page }} + +Total Pages: {{ paginator.total_pages }} diff --git a/spec/fixtures/jekyll-avatar.html b/spec/fixtures/jekyll-avatar.html new file mode 100644 index 00000000..d3100991 --- /dev/null +++ b/spec/fixtures/jekyll-avatar.html @@ -0,0 +1,4 @@ +--- +--- + +{% avatar hubot %} diff --git a/spec/fixtures/jekyll-coffeescript.coffee b/spec/fixtures/jekyll-coffeescript.coffee new file mode 100644 index 00000000..40459fa7 --- /dev/null +++ b/spec/fixtures/jekyll-coffeescript.coffee @@ -0,0 +1,4 @@ +--- +--- + +console.log "hello world" diff --git a/spec/fixtures/jekyll-default-layout.md b/spec/fixtures/jekyll-default-layout.md new file mode 100644 index 00000000..76eca68a --- /dev/null +++ b/spec/fixtures/jekyll-default-layout.md @@ -0,0 +1,4 @@ +--- +--- + +This page's layout is "{{ page.layout }}" diff --git a/spec/fixtures/jekyll-gist.md b/spec/fixtures/jekyll-gist.md new file mode 100644 index 00000000..03e2ee5c --- /dev/null +++ b/spec/fixtures/jekyll-gist.md @@ -0,0 +1,4 @@ +--- +--- + +{% gist parkr/c08ee0f2726fd0e3909d %} diff --git a/spec/fixtures/jekyll-github-metadata.html b/spec/fixtures/jekyll-github-metadata.html new file mode 100644 index 00000000..b323c391 --- /dev/null +++ b/spec/fixtures/jekyll-github-metadata.html @@ -0,0 +1,4 @@ +--- +--- + +Branch: {{ site.github.source.branch }} diff --git a/spec/fixtures/jekyll-mentions.md b/spec/fixtures/jekyll-mentions.md new file mode 100644 index 00000000..26a8061e --- /dev/null +++ b/spec/fixtures/jekyll-mentions.md @@ -0,0 +1,4 @@ +--- +--- + +@jekyll diff --git a/spec/fixtures/jekyll-optional-front-matter.md b/spec/fixtures/jekyll-optional-front-matter.md new file mode 100644 index 00000000..e30c8c03 --- /dev/null +++ b/spec/fixtures/jekyll-optional-front-matter.md @@ -0,0 +1 @@ +# File without front matter diff --git a/spec/fixtures/jekyll-readme-index/README.md b/spec/fixtures/jekyll-readme-index/README.md new file mode 100644 index 00000000..7e596007 --- /dev/null +++ b/spec/fixtures/jekyll-readme-index/README.md @@ -0,0 +1 @@ +# README diff --git a/spec/fixtures/jekyll-relative-links.md b/spec/fixtures/jekyll-relative-links.md new file mode 100644 index 00000000..889348d1 --- /dev/null +++ b/spec/fixtures/jekyll-relative-links.md @@ -0,0 +1,5 @@ +--- +--- + + +[Jekyll](jekyll.md) diff --git a/spec/fixtures/jekyll-sass-converter.scss b/spec/fixtures/jekyll-sass-converter.scss new file mode 100644 index 00000000..c770df66 --- /dev/null +++ b/spec/fixtures/jekyll-sass-converter.scss @@ -0,0 +1,8 @@ +--- +--- + +$color: #333; + +body { + color: $color; +} diff --git a/spec/fixtures/jekyll-seo-tag.html b/spec/fixtures/jekyll-seo-tag.html new file mode 100644 index 00000000..1e026768 --- /dev/null +++ b/spec/fixtures/jekyll-seo-tag.html @@ -0,0 +1,5 @@ +--- +title: Jekyll SEO Tag +--- + +{% seo %} diff --git a/spec/fixtures/jekyll-titles-from-headings.md b/spec/fixtures/jekyll-titles-from-headings.md new file mode 100644 index 00000000..be0e527f --- /dev/null +++ b/spec/fixtures/jekyll-titles-from-headings.md @@ -0,0 +1,6 @@ +--- +--- + +# First heading + +The page title is "{{ page.title }}" diff --git a/spec/fixtures/jekyll.md b/spec/fixtures/jekyll.md new file mode 100644 index 00000000..fd01db30 --- /dev/null +++ b/spec/fixtures/jekyll.md @@ -0,0 +1,4 @@ +--- +--- + +# Jekyll diff --git a/spec/fixtures/jemoji.md b/spec/fixtures/jemoji.md new file mode 100644 index 00000000..fea9ca7c --- /dev/null +++ b/spec/fixtures/jemoji.md @@ -0,0 +1,4 @@ +--- +--- + +:tada: diff --git a/spec/fixtures/kramdown.md b/spec/fixtures/kramdown.md new file mode 100644 index 00000000..ef355dc0 --- /dev/null +++ b/spec/fixtures/kramdown.md @@ -0,0 +1,4 @@ +--- +--- + +# Test diff --git a/spec/fixtures/liquid.html b/spec/fixtures/liquid.html new file mode 100644 index 00000000..1b70d69b --- /dev/null +++ b/spec/fixtures/liquid.html @@ -0,0 +1,5 @@ +--- +foo: bar +--- + +Value of foo: {{ page.foo }} diff --git a/spec/fixtures/redirect_from.html b/spec/fixtures/redirect_from.html new file mode 100644 index 00000000..1af61da6 --- /dev/null +++ b/spec/fixtures/redirect_from.html @@ -0,0 +1,3 @@ +--- +redirect_from: /redirect/ +--- diff --git a/spec/fixtures/redirect_to.html b/spec/fixtures/redirect_to.html new file mode 100644 index 00000000..8c88da70 --- /dev/null +++ b/spec/fixtures/redirect_to.html @@ -0,0 +1,3 @@ +--- +redirect_to: /someplace-else/ +--- diff --git a/spec/fixtures/rouge.md b/spec/fixtures/rouge.md new file mode 100644 index 00000000..ed8569fd --- /dev/null +++ b/spec/fixtures/rouge.md @@ -0,0 +1,6 @@ +--- +--- + +```ruby +puts "hello world" +``` diff --git a/spec/github-pages/integration_spec.rb b/spec/github-pages/integration_spec.rb new file mode 100644 index 00000000..c28323fb --- /dev/null +++ b/spec/github-pages/integration_spec.rb @@ -0,0 +1,215 @@ +# frozen_string_literal: true + +RSpec.describe "Pages Gem Integration spec" do + def destination_file(file) + File.join tmp_dir, file + end + + def source + @source ||= fixture_dir + end + + def destination + @destination ||= tmp_dir + end + + def env + { "BUNDLE_GEMFILE" => "#{source}/Gemfile" } + end + + def run_or_raise(env, *cmd) + stdout_and_stderr_str, status = Open3.capture2e env, *cmd + raise StandardError, stdout_and_stderr_str if status.exitstatus != 0 + end + + let(:file) { "#{self.class.description}.html" } + let(:path) { destination_file file } + let(:contents) { File.read path } + + before(:all) { FileUtils.rm_rf(destination) } + before(:all) do + Dir.chdir(source) do + run_or_raise env, %w(bundle install) + cmd = %w(bundle exec jekyll build --verbose) + cmd = cmd.concat ["--source", source, "--destination", destination] + run_or_raise env, *cmd + end + end + after(:all) { FileUtils.rm_rf(destination) } + + it "tests all dependencies" do + contents = File.read(__FILE__) + contexts = contents.scan(/context \"(.*?)\"/) + missing = GitHubPages::Dependencies::VERSIONS.keys - contexts.flatten + missing -= %w(listen activesupport github-pages-health-check) + msg = "The following dependencies are missing integration tests: #{missing.join(", ")}" + expect(missing).to be_empty, msg + end + + context "jekyll" do + it "builds" do + expect(path).to be_an_existing_file + end + end + + context "jekyll-sass-converter" do + let(:file) { "jekyll-sass-converter.css" } + + it "Renders SCSS" do + expect(path).to be_an_existing_file + expect(contents).to match("body { color: #333; }") + end + end + + context "kramdown" do + it "converts markdown to HTML" do + expect(contents).to match('

Test

') + end + end + + context "liquid" do + it "renders liquid templates" do + expect(contents).to match("Value of foo: bar") + end + end + + context "rouge" do + it "syntax highlights" do + expected = '
'.dup + expected << '
'
+      expected << 'puts "hello world"'
+      expect(contents).to match(expected)
+    end
+  end
+
+  context "jekyll-redirect-from" do
+    context "redirect_from" do
+      let(:file) { "redirect/index.html" }
+
+      it "redirects from" do
+        expect(path).to be_an_existing_file
+        expected = ''
+        expect(contents).to match(expected)
+      end
+    end
+
+    context "redirect_to" do
+      it "redirects to" do
+        expect(path).to be_an_existing_file
+        expected = ''
+        expect(contents).to match(expected)
+      end
+    end
+  end
+
+  context "jekyll-sitemap" do
+    let(:file) { "sitemap.xml" }
+
+    it "builds the sitemap" do
+      expect(path).to be_an_existing_file
+      expect(contents).to match("/jekyll.html")
+    end
+  end
+
+  context "jekyll-feed" do
+    let(:file) { "feed.xml" }
+
+    it "builds the feed" do
+      expect(path).to be_an_existing_file
+      expected = 'TestJekyll SEO Tag | pages-gem")
+    end
+  end
+
+  context "jekyll-github-metadata" do
+    it "builds the site.github namespace" do
+      expect(contents).to match("Branch: gh-pages")
+    end
+  end
+
+  context "jekyll-avatar" do
+    it "renders the avatar" do
+      expected = %r{https://avatars\d\.githubusercontent\.com/hubot\?v=3&s=40}
+      expect(contents).to match(expected)
+    end
+  end
+
+  context "jemoji" do
+    it "renders emoji" do
+      expect(contents).to match(':tada:@jekyll')
+    end
+  end
+
+  context "jekyll-relative-links" do
+    it "converts relative links" do
+      expect(contents).to match('Jekyll')
+    end
+  end
+
+  context "jekyll-optional-front-matter" do
+    it "renders pages without front matter" do
+      expect(path).to be_an_existing_file
+      expected = '
File without front matter
'
+      expect(contents).to match(expected)
+    end
+  end
+
+  context "jekyll-titles-from-headings" do
+    it "pulls titles from headings" do
+      expect(contents).to match("The page title is “First heading”")
+    end
+  end
+
+  context "jekyll-default-layout" do
+    it "sets the default layout" do
+      expect(contents).to match("This page’s layout is “page”")
+    end
+  end
+
+  context "jekyll-readme-index" do
+    let(:file) { "jekyll-readme-index/index.html" }
+
+    it "uses the README as the index" do
+      expect(path).to be_an_existing_file
+      expect(contents).to match("README")
+    end
+  end
+end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 30feab47..8b92e07e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require File.expand_path("../../lib/github-pages.rb", __FILE__)
+require "open3"
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
@@ -14,9 +15,13 @@
 end
 
 def fixture_dir
-  File.expand_path "./fixtures", File.dirname(__FILE__)
+  File.expand_path "./fixtures", __dir__
 end
 
 def tmp_dir
-  File.expand_path "./test-site", File.dirname(__FILE__)
+  File.expand_path "../tmp", __dir__
+end
+
+RSpec::Matchers.define :be_an_existing_file do
+  match { |path| File.exist?(path) }
 end

From 80bc78c53fff9d0eccce2158d90bfa1fdf75dd9d Mon Sep 17 00:00:00 2001
From: Ben Balter 
Date: Fri, 1 Sep 2017 11:37:14 -0400
Subject: [PATCH 05/31] combine before blocks

---
 spec/github-pages/integration_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/github-pages/integration_spec.rb b/spec/github-pages/integration_spec.rb
index c28323fb..6e8d6c89 100644
--- a/spec/github-pages/integration_spec.rb
+++ b/spec/github-pages/integration_spec.rb
@@ -26,8 +26,8 @@ def run_or_raise(env, *cmd)
   let(:path) { destination_file file }
   let(:contents) { File.read path }
 
-  before(:all) { FileUtils.rm_rf(destination) }
   before(:all) do
+    FileUtils.rm_rf(destination)
     Dir.chdir(source) do
       run_or_raise env, %w(bundle install)
       cmd = %w(bundle exec jekyll build --verbose)

From c09f19667dfd9eb2a04d6c50a6c7b2b05142eaf6 Mon Sep 17 00:00:00 2001
From: Ben Balter 
Date: Fri, 1 Sep 2017 11:37:48 -0400
Subject: [PATCH 06/31] simplify require logic, props @dirtyF

---
 spec/spec_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 8b92e07e..f61eb9b7 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require File.expand_path("../../lib/github-pages.rb", __FILE__)
+require File.expand_path("../lib/github-pages.rb", __dir__)
 require "open3"
 
 RSpec.configure do |config|

From 661aa3599cb27e71c71e14c6b0da89025cfa4418 Mon Sep 17 00:00:00 2001
From: Ben Balter 
Date: Fri, 1 Sep 2017 11:38:09 -0400
Subject: [PATCH 07/31] simplify require logic, props @dirtyF

---
 spec/spec_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f61eb9b7..ce750cf7 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -15,7 +15,7 @@
 end
 
 def fixture_dir
-  File.expand_path "./fixtures", __dir__
+  File.expand_path "fixtures", __dir__
 end
 
 def tmp_dir

From 1cc63aa34155a105de751ce93d3d7f49a4aad632 Mon Sep 17 00:00:00 2001
From: Ben Balter 
Date: Fri, 1 Sep 2017 11:41:43 -0400
Subject: [PATCH 08/31] correct test expectations

---
 spec/github-pages/integration_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/github-pages/integration_spec.rb b/spec/github-pages/integration_spec.rb
index 6e8d6c89..47eeab29 100644
--- a/spec/github-pages/integration_spec.rb
+++ b/spec/github-pages/integration_spec.rb
@@ -57,7 +57,7 @@ def run_or_raise(env, *cmd)
 
     it "Renders SCSS" do
       expect(path).to be_an_existing_file
-      expect(contents).to match("body { color: #333; }")
+      expect(contents).to match("body{color:#333}")
     end
   end
 
@@ -149,7 +149,7 @@ def run_or_raise(env, *cmd)
 
   context "jekyll-seo-tag" do
     it "outputs the tag" do
-      expect(contents).to match("Jekyll SEO Tag | pages-gem")
+      expect(contents).to match("Jekyll SEO Tag")
     end
   end
 

From 2aa6fbd9e2a31a2d81ce08bff3f49af3ef274469 Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Fri, 1 Sep 2017 11:45:01 -0400
Subject: [PATCH 09/31] integration tests should run in development

---
 spec/github-pages/integration_spec.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/spec/github-pages/integration_spec.rb b/spec/github-pages/integration_spec.rb
index 47eeab29..d6d96f11 100644
--- a/spec/github-pages/integration_spec.rb
+++ b/spec/github-pages/integration_spec.rb
@@ -14,7 +14,10 @@ def destination
   end
 
   def env
-    { "BUNDLE_GEMFILE" => "#{source}/Gemfile" }
+    {
+      "BUNDLE_GEMFILE" => "#{source}/Gemfile",
+      "JEKYLL_ENV"     => "development",
+    }
   end
 
   def run_or_raise(env, *cmd)
@@ -57,7 +60,7 @@ def run_or_raise(env, *cmd)
 
     it "Renders SCSS" do
       expect(path).to be_an_existing_file
-      expect(contents).to match("body{color:#333}")
+      expect(contents).to match("body { color: #333; }")
     end
   end
 

From 0ab50e11a77ade0bc1056893bd5373de6e589990 Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Fri, 1 Sep 2017 13:53:07 -0400
Subject: [PATCH 10/31] include bundle output if build fails

---
 spec/github-pages/integration_spec.rb | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/spec/github-pages/integration_spec.rb b/spec/github-pages/integration_spec.rb
index d6d96f11..b14a24d2 100644
--- a/spec/github-pages/integration_spec.rb
+++ b/spec/github-pages/integration_spec.rb
@@ -20,11 +20,6 @@ def env
     }
   end
 
-  def run_or_raise(env, *cmd)
-    stdout_and_stderr_str, status = Open3.capture2e env, *cmd
-    raise StandardError, stdout_and_stderr_str if status.exitstatus != 0
-  end
-
   let(:file) { "#{self.class.description}.html" }
   let(:path) { destination_file file }
   let(:contents) { File.read path }
@@ -32,10 +27,12 @@ def run_or_raise(env, *cmd)
   before(:all) do
     FileUtils.rm_rf(destination)
     Dir.chdir(source) do
-      run_or_raise env, %w(bundle install)
+      bundle_output, status = Open3.capture2e env, %w(bundle install)
+      raise StandardError, stdout_and_stderr_str if status.exitstatus != 0
       cmd = %w(bundle exec jekyll build --verbose)
       cmd = cmd.concat ["--source", source, "--destination", destination]
-      run_or_raise env, *cmd
+      build_output, status = Open3.capture2e env, *cmd
+      raise StandardError, bundle_output + build_output if status.exitstatus != 0
     end
   end
   after(:all) { FileUtils.rm_rf(destination) }

From c1b4f8464e23847f73d84a58ebd552a6021e0e94 Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Fri, 1 Sep 2017 13:54:22 -0400
Subject: [PATCH 11/31] include malicious plugin in fixture Gemfile

---
 spec/fixtures/Gemfile                 | 1 +
 spec/github-pages/integration_spec.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/fixtures/Gemfile b/spec/fixtures/Gemfile
index 7fe62b23..a3214f42 100644
--- a/spec/fixtures/Gemfile
+++ b/spec/fixtures/Gemfile
@@ -3,3 +3,4 @@
 source "https://rubygems.org"
 
 gem "github-pages", :group => :jekyll_plugins, :path => "../../"
+gem "jekyll_test_plugin_malicious"
diff --git a/spec/github-pages/integration_spec.rb b/spec/github-pages/integration_spec.rb
index b14a24d2..b5e444ac 100644
--- a/spec/github-pages/integration_spec.rb
+++ b/spec/github-pages/integration_spec.rb
@@ -28,7 +28,7 @@ def env
     FileUtils.rm_rf(destination)
     Dir.chdir(source) do
       bundle_output, status = Open3.capture2e env, %w(bundle install)
-      raise StandardError, stdout_and_stderr_str if status.exitstatus != 0
+      raise StandardError, bundle_output if status.exitstatus != 0
       cmd = %w(bundle exec jekyll build --verbose)
       cmd = cmd.concat ["--source", source, "--destination", destination]
       build_output, status = Open3.capture2e env, *cmd

From 2ef49028b42073f3f2c61ee8ba0bf5c8939e4016 Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Fri, 1 Sep 2017 14:13:03 -0400
Subject: [PATCH 12/31] failing tests for primer not being set locally

---
 spec/fixtures/jekyll-theme-primer.md    |  4 ++++
 spec/github-pages/configuration_spec.rb |  6 ++++++
 spec/github-pages/integration_spec.rb   | 10 ++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 spec/fixtures/jekyll-theme-primer.md

diff --git a/spec/fixtures/jekyll-theme-primer.md b/spec/fixtures/jekyll-theme-primer.md
new file mode 100644
index 00000000..661146ac
--- /dev/null
+++ b/spec/fixtures/jekyll-theme-primer.md
@@ -0,0 +1,4 @@
+---
+---
+
+Theme: {{ site.theme }}
diff --git a/spec/github-pages/configuration_spec.rb b/spec/github-pages/configuration_spec.rb
index 659cedef..39a6647b 100644
--- a/spec/github-pages/configuration_spec.rb
+++ b/spec/github-pages/configuration_spec.rb
@@ -58,6 +58,12 @@
       expect(effective_config["testing"]).to eql("123")
     end
 
+    it "sets the theme" do
+      expect(site.theme).to_not be_nil
+      expect(site.theme).to be_a(Jekyll::Theme)
+      expect(site.theme.name).to eql("jekyll-theme-primer")
+    end
+
     context "in development" do
       before { ENV["JEKYLL_ENV"] = "development" }
 
diff --git a/spec/github-pages/integration_spec.rb b/spec/github-pages/integration_spec.rb
index b5e444ac..863768b2 100644
--- a/spec/github-pages/integration_spec.rb
+++ b/spec/github-pages/integration_spec.rb
@@ -212,4 +212,14 @@ def env
       expect(contents).to match("README")
     end
   end
+
+  context "jekyll-theme-primer" do
+    it "sets the theme" do
+      expect(contents).to match("Theme: jekyll-theme-primer")
+    end
+
+    it "uses the theme" do
+      expect(contents).to match('<div class="container-lg px-3 my-5 markdown-body">')
+    end
+  end
 end

From 4befeebad3ee843f76dc5175e3cb363dfc18f0c2 Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Fri, 1 Sep 2017 14:15:12 -0400
Subject: [PATCH 13/31] use site.config = rather than instance_variable_set to
 configure theme

---
 lib/github-pages/configuration.rb    | 14 +-------------
 spec/fixtures/jekyll-theme-primer.md |  1 +
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/lib/github-pages/configuration.rb b/lib/github-pages/configuration.rb
index 563411db..f6db2afa 100644
--- a/lib/github-pages/configuration.rb
+++ b/lib/github-pages/configuration.rb
@@ -137,19 +137,7 @@ def debug_print_versions
       # Set the site's configuration with all the proper defaults and overrides.
       # Should be called by #set to protect against multiple processings.
       def set!(site)
-        config = effective_config(site.config)
-
-        # Assign everything to the site
-        site.instance_variable_set :@config, config
-
-        # Ensure all
-        CONFIGS_WITH_METHODS.each do |opt|
-          site.public_send("#{opt}=", site.config[opt])
-        end
-
-        # While Configuration renamed the gems key to plugins, Site retained
-        # backwards compatability and must be set manually
-        site.gems = site.config["plugins"]
+        site.config = effective_config(site.config)
       end
     end
   end
diff --git a/spec/fixtures/jekyll-theme-primer.md b/spec/fixtures/jekyll-theme-primer.md
index 661146ac..70122eab 100644
--- a/spec/fixtures/jekyll-theme-primer.md
+++ b/spec/fixtures/jekyll-theme-primer.md
@@ -1,4 +1,5 @@
 ---
+layout: default
 ---
 
 Theme: {{ site.theme }}

From 4de31bb17f5740ab8753767a3e70ad580be64886 Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Fri, 1 Sep 2017 14:26:48 -0400
Subject: [PATCH 14/31] test that configuration respects the users theme

---
 spec/github-pages/configuration_spec.rb | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/spec/github-pages/configuration_spec.rb b/spec/github-pages/configuration_spec.rb
index 39a6647b..6d449c62 100644
--- a/spec/github-pages/configuration_spec.rb
+++ b/spec/github-pages/configuration_spec.rb
@@ -58,10 +58,27 @@
       expect(effective_config["testing"]).to eql("123")
     end
 
-    it "sets the theme" do
-      expect(site.theme).to_not be_nil
-      expect(site.theme).to be_a(Jekyll::Theme)
-      expect(site.theme.name).to eql("jekyll-theme-primer")
+    context "themes" do
+      context "with no theme set" do
+        it "sets the theme" do
+          expect(site.theme).to_not be_nil
+          expect(site.theme).to be_a(Jekyll::Theme)
+          expect(site.theme.name).to eql("jekyll-theme-primer")
+        end
+      end
+
+      context "with a user-specified theme" do
+        let(:site) do
+          config = configuration.merge("theme" => "jekyll-theme-merlot")
+          Jekyll::Site.new(config)
+        end
+
+        it "respects the theme" do
+          expect(site.theme).to_not be_nil
+          expect(site.theme).to be_a(Jekyll::Theme)
+          expect(site.theme.name).to eql("jekyll-theme-merlot")
+        end
+      end
     end
 
     context "in development" do

From 21d3e53b360383ea64146397dfb2dba22de49654 Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Tue, 5 Sep 2017 10:40:34 -0400
Subject: [PATCH 15/31] Bump :gem: to v158

---
 lib/github-pages/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/github-pages/version.rb b/lib/github-pages/version.rb
index 9f5aca0e..5c7694d2 100644
--- a/lib/github-pages/version.rb
+++ b/lib/github-pages/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitHubPages
-  VERSION = 157
+  VERSION = 158
 end

From 93a558d1bf8c4cb6a940be205196b66591eed186 Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Thu, 7 Sep 2017 10:30:14 -0400
Subject: [PATCH 16/31] bump sitemap, metadata, avatar, and coffeescript

---
 lib/github-pages/dependencies.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb
index ada156c6..1c6c549c 100644
--- a/lib/github-pages/dependencies.rb
+++ b/lib/github-pages/dependencies.rb
@@ -20,14 +20,14 @@ class Dependencies
 
       # Plugins
       "jekyll-redirect-from"   => "0.12.1",
-      "jekyll-sitemap"         => "1.0.0",
+      "jekyll-sitemap"         => "1.1.1",
       "jekyll-feed"            => "0.9.2",
       "jekyll-gist"            => "1.4.1",
       "jekyll-paginate"        => "1.1.0",
-      "jekyll-coffeescript"    => "1.0.1",
+      "jekyll-coffeescript"    => "1.0.2",
       "jekyll-seo-tag"         => "2.3.0",
-      "jekyll-github-metadata" => "2.9.1",
-      "jekyll-avatar"          => "0.4.2",
+      "jekyll-github-metadata" => "2.9.2",
+      "jekyll-avatar"          => "0.5.0",
 
       # Plugins to match GitHub.com Markdown
       "jemoji"                       => "0.8.0",

From d6ac353404e52dba731193c4e5bb1220e0d750f7 Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Thu, 7 Sep 2017 10:37:38 -0400
Subject: [PATCH 17/31] stub fixture site source to avoid API rate limiting

---
 spec/fixtures/_config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spec/fixtures/_config.yml b/spec/fixtures/_config.yml
index 7222eab9..233301e8 100644
--- a/spec/fixtures/_config.yml
+++ b/spec/fixtures/_config.yml
@@ -12,3 +12,6 @@ gems:
   - jekyll_test_plugin_malicious
 quiet: false
 paginate: 5
+github:
+  source:
+    branch: gh-pages

From 66675a0bfb2e48a513fa383a4d3c7a4e9c415525 Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Thu, 7 Sep 2017 12:19:04 -0400
Subject: [PATCH 18/31] Bump :gem: to v159

---
 lib/github-pages/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/github-pages/version.rb b/lib/github-pages/version.rb
index 5c7694d2..f1fd892e 100644
--- a/lib/github-pages/version.rb
+++ b/lib/github-pages/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitHubPages
-  VERSION = 158
+  VERSION = 159
 end

From f6c30fc112f6cde5e7e5039de5c6f5f37e3ce0c0 Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Thu, 7 Sep 2017 18:49:57 -0400
Subject: [PATCH 19/31] bump jekyll metadata :gem: to 2.9.3

---
 lib/github-pages/dependencies.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb
index 1c6c549c..ace1dfed 100644
--- a/lib/github-pages/dependencies.rb
+++ b/lib/github-pages/dependencies.rb
@@ -26,7 +26,7 @@ class Dependencies
       "jekyll-paginate"        => "1.1.0",
       "jekyll-coffeescript"    => "1.0.2",
       "jekyll-seo-tag"         => "2.3.0",
-      "jekyll-github-metadata" => "2.9.2",
+      "jekyll-github-metadata" => "2.9.3",
       "jekyll-avatar"          => "0.5.0",
 
       # Plugins to match GitHub.com Markdown

From bee21df8321cce8953f5e6ccf661c92cb8c0dbbc Mon Sep 17 00:00:00 2001
From: Ben Balter <ben.balter@github.com>
Date: Thu, 7 Sep 2017 18:55:49 -0400
Subject: [PATCH 20/31] Bump :gem: to v160

---
 lib/github-pages/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/github-pages/version.rb b/lib/github-pages/version.rb
index f1fd892e..e770aead 100644
--- a/lib/github-pages/version.rb
+++ b/lib/github-pages/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitHubPages
-  VERSION = 159
+  VERSION = 160
 end

From d88cf557b20422cc6a246fcff8e2eb1a4bb6105b Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Tue, 12 Sep 2017 17:44:05 -0400
Subject: [PATCH 21/31] Whitelist jekyll-octicons for everyone

But do not include as a runtime dependency.
---
 lib/github-pages/plugins.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/github-pages/plugins.rb b/lib/github-pages/plugins.rb
index d3cd82d2..369b25ea 100644
--- a/lib/github-pages/plugins.rb
+++ b/lib/github-pages/plugins.rb
@@ -35,6 +35,7 @@ class Plugins
       jekyll-default-layout
       jekyll-titles-from-headings
       jekyll-include-cache
+      jekyll-octicons
     ).freeze
 
     # Plugins only allowed locally

From 0c79d7caf66bf209d08d3ee3829c217716a63479 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkr@github.com>
Date: Tue, 12 Sep 2017 17:59:01 -0400
Subject: [PATCH 22/31] Add test for jekyll-octicons

---
 Gemfile                               | 3 +++
 spec/fixtures/Gemfile                 | 3 +++
 spec/fixtures/_config.yml             | 1 +
 spec/fixtures/jekyll-octicons.md      | 4 ++++
 spec/github-pages/integration_spec.rb | 8 ++++++++
 spec/github-pages/plugins_spec.rb     | 1 +
 6 files changed, 20 insertions(+)
 create mode 100644 spec/fixtures/jekyll-octicons.md

diff --git a/Gemfile b/Gemfile
index be173b20..db52f9e9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,3 +3,6 @@
 source "https://rubygems.org"
 
 gemspec
+
+# Whitelisted plugins not included in runtime dependencies.
+gem "jekyll-octicons"
diff --git a/spec/fixtures/Gemfile b/spec/fixtures/Gemfile
index a3214f42..b7a0058e 100644
--- a/spec/fixtures/Gemfile
+++ b/spec/fixtures/Gemfile
@@ -4,3 +4,6 @@ source "https://rubygems.org"
 
 gem "github-pages", :group => :jekyll_plugins, :path => "../../"
 gem "jekyll_test_plugin_malicious"
+
+# Whitelisted plugins not included in runtime dependencies.
+gem "jekyll-octicons", :group => :jekyll_plugins
diff --git a/spec/fixtures/_config.yml b/spec/fixtures/_config.yml
index 233301e8..9e3ba69b 100644
--- a/spec/fixtures/_config.yml
+++ b/spec/fixtures/_config.yml
@@ -4,6 +4,7 @@ gems:
   - jekyll-sitemap
   - jekyll-redirect-from
   - jekyll-feed
+  - jekyll-octicons
   - jekyll-paginate
   - jekyll-seo-tag
   - jekyll-avatar
diff --git a/spec/fixtures/jekyll-octicons.md b/spec/fixtures/jekyll-octicons.md
new file mode 100644
index 00000000..06cd7a98
--- /dev/null
+++ b/spec/fixtures/jekyll-octicons.md
@@ -0,0 +1,4 @@
+---
+---
+
+{% octicon alert height:32 class:"right left" aria-label:hi %}
diff --git a/spec/github-pages/integration_spec.rb b/spec/github-pages/integration_spec.rb
index 863768b2..cc322cd2 100644
--- a/spec/github-pages/integration_spec.rb
+++ b/spec/github-pages/integration_spec.rb
@@ -222,4 +222,12 @@ def env
       expect(contents).to match('<div class="container-lg px-3 my-5 markdown-body">')
     end
   end
+
+  context "jekyll-octicons" do
+    it "plops in the octicon" do
+      expect(contents).to match('<svg height="32"')
+      expect(contents).to match('class="octicon octicon-alert right left"')
+      expect(contents).to match('aria-label="hi"')
+    end
+  end
 end
diff --git a/spec/github-pages/plugins_spec.rb b/spec/github-pages/plugins_spec.rb
index c3a75815..3be6c8e9 100644
--- a/spec/github-pages/plugins_spec.rb
+++ b/spec/github-pages/plugins_spec.rb
@@ -15,6 +15,7 @@
     GitHubPages::Plugins::PLUGIN_WHITELIST.each do |plugin|
       it "versions the #{plugin} plugin" do
         next if plugin == "jekyll-include-cache"
+        next if plugin == "jekyll-octicons" # TODO: we should expose the version for these
         expect(GitHubPages::Dependencies::VERSIONS.keys).to include(plugin)
       end
     end

From 44ab2dada3df0444fda86d813839f64c401409ad Mon Sep 17 00:00:00 2001
From: Parker Moore <parkr@github.com>
Date: Wed, 13 Sep 2017 10:47:30 -0400
Subject: [PATCH 23/31] Integration spec should enable the whitelist.

---
 spec/github-pages/integration_spec.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/github-pages/integration_spec.rb b/spec/github-pages/integration_spec.rb
index cc322cd2..158f13f0 100644
--- a/spec/github-pages/integration_spec.rb
+++ b/spec/github-pages/integration_spec.rb
@@ -17,6 +17,7 @@ def env
     {
       "BUNDLE_GEMFILE" => "#{source}/Gemfile",
       "JEKYLL_ENV"     => "development",
+      "DISABLE_WHITELIST" => "", # Do not disable the whitelist.
     }
   end
 
@@ -29,7 +30,7 @@ def env
     Dir.chdir(source) do
       bundle_output, status = Open3.capture2e env, %w(bundle install)
       raise StandardError, bundle_output if status.exitstatus != 0
-      cmd = %w(bundle exec jekyll build --verbose)
+      cmd = %w(bundle exec jekyll build --verbose --trace)
       cmd = cmd.concat ["--source", source, "--destination", destination]
       build_output, status = Open3.capture2e env, *cmd
       raise StandardError, bundle_output + build_output if status.exitstatus != 0

From a8101ee4e67ba88641c2df9c5c1244abad1658f1 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkr@github.com>
Date: Mon, 18 Sep 2017 13:16:40 -0400
Subject: [PATCH 24/31] Bump :gem: to v161

---
 lib/github-pages/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/github-pages/version.rb b/lib/github-pages/version.rb
index e770aead..959891f2 100644
--- a/lib/github-pages/version.rb
+++ b/lib/github-pages/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitHubPages
-  VERSION = 160
+  VERSION = 161
 end

From 41ca91cdfb098d1294d3d7fb7691b8dddda8f928 Mon Sep 17 00:00:00 2001
From: Hubot <hubot@users.noreply.github.com>
Date: Thu, 21 Sep 2017 12:48:35 -0500
Subject: [PATCH 25/31] Bump jemoji :gem: to v0.8.1

---
 lib/github-pages/dependencies.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb
index ace1dfed..f5a646e3 100644
--- a/lib/github-pages/dependencies.rb
+++ b/lib/github-pages/dependencies.rb
@@ -30,7 +30,7 @@ class Dependencies
       "jekyll-avatar"          => "0.5.0",
 
       # Plugins to match GitHub.com Markdown
-      "jemoji"                       => "0.8.0",
+      "jemoji"                       => "0.8.1",
       "jekyll-mentions"              => "1.2.0",
       "jekyll-relative-links"        => "0.4.1",
       "jekyll-optional-front-matter" => "0.2.0",

From 0ef6cc024474222421f74503560c8c3912154eb0 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 21 Sep 2017 13:49:04 -0400
Subject: [PATCH 26/31] activesupport 4.2.9

---
 lib/github-pages/dependencies.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb
index f5a646e3..04e35401 100644
--- a/lib/github-pages/dependencies.rb
+++ b/lib/github-pages/dependencies.rb
@@ -43,7 +43,7 @@ class Dependencies
       "listen"                    => "3.0.6",
 
       # Pin activesupport because 5.0 is broken on 2.1
-      "activesupport"             => "4.2.8",
+      "activesupport"             => "4.2.9",
     }.freeze
 
     # Jekyll and related dependency versions as used by GitHub Pages.

From 4e3a2c4a15f0e443efa668a006c3adc76da12d91 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Thu, 21 Sep 2017 17:45:19 -0400
Subject: [PATCH 27/31] 3.6.0 proper

---
 lib/github-pages/dependencies.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb
index cb23136d..0969c014 100644
--- a/lib/github-pages/dependencies.rb
+++ b/lib/github-pages/dependencies.rb
@@ -7,7 +7,7 @@ module GitHubPages
   class Dependencies
     VERSIONS = {
       # Jekyll
-      "jekyll"                    => "3.6.0.pre.beta1",
+      "jekyll"                    => "3.6.0",
       "jekyll-sass-converter"     => "1.5.0",
 
       # Converters

From 78565a36db4ddfe89d40bf25f29c3a62c57992ae Mon Sep 17 00:00:00 2001
From: Hubot <hubot@users.noreply.github.com>
Date: Wed, 27 Sep 2017 15:14:00 -0500
Subject: [PATCH 28/31] Bump jekyll-relative-links :gem: to v0.5.0

---
 lib/github-pages/dependencies.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/github-pages/dependencies.rb b/lib/github-pages/dependencies.rb
index ace1dfed..256b70b3 100644
--- a/lib/github-pages/dependencies.rb
+++ b/lib/github-pages/dependencies.rb
@@ -32,7 +32,7 @@ class Dependencies
       # Plugins to match GitHub.com Markdown
       "jemoji"                       => "0.8.0",
       "jekyll-mentions"              => "1.2.0",
-      "jekyll-relative-links"        => "0.4.1",
+      "jekyll-relative-links"        => "0.5.0",
       "jekyll-optional-front-matter" => "0.2.0",
       "jekyll-readme-index"          => "0.1.0",
       "jekyll-default-layout"        => "0.1.4",

From ba93726a6bdc7fba6232901c46ef119360df4448 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkr@github.com>
Date: Mon, 2 Oct 2017 15:33:16 -0400
Subject: [PATCH 29/31] Bump :gem: to v162

---
 lib/github-pages/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/github-pages/version.rb b/lib/github-pages/version.rb
index 959891f2..eb880793 100644
--- a/lib/github-pages/version.rb
+++ b/lib/github-pages/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitHubPages
-  VERSION = 161
+  VERSION = 162
 end

From 557e51049f28f0acaeadb1459c297996b0fb09bd Mon Sep 17 00:00:00 2001
From: Parker Moore <parkr@github.com>
Date: Tue, 3 Oct 2017 11:48:35 -0400
Subject: [PATCH 30/31] Bump :gem: to v163

---
 lib/github-pages/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/github-pages/version.rb b/lib/github-pages/version.rb
index eb880793..ad6e0867 100644
--- a/lib/github-pages/version.rb
+++ b/lib/github-pages/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitHubPages
-  VERSION = 162
+  VERSION = 163
 end

From 1841a27eabba5265940b187293e832802e5eb2b2 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkr@github.com>
Date: Tue, 17 Oct 2017 15:42:02 -0400
Subject: [PATCH 31/31] Bump :gem: to v164

---
 lib/github-pages/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/github-pages/version.rb b/lib/github-pages/version.rb
index ad6e0867..9985c63d 100644
--- a/lib/github-pages/version.rb
+++ b/lib/github-pages/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitHubPages
-  VERSION = 163
+  VERSION = 164
 end