Merge branch 'master' into master

.travis.yml

@@ -9,6 +9,7 @@ branches:
     - master
 
 before_install:
+  - gem update --system
   - gem install bundler
 script: "script/cibuild"
 env:

Gemfile

@@ -6,3 +6,7 @@ gemspec
 
 # Whitelisted plugins not included in runtime dependencies.
 gem "jekyll-octicons"
+
+group :test do
+  gem "webmock"
+end

github-pages.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency("mercenary", "~> 0.3")
   s.add_dependency("terminal-table", "~> 1.4")
-  s.add_dependency("nokogiri", ">= 1.8.2", "< 2.0") # CVE-2017-9050, CVE-2017-18258
+  s.add_dependency("nokogiri", ">= 1.8.5", "< 2.0")
   s.add_development_dependency("rspec", "~> 3.3")
   s.add_development_dependency("rainbow", "~> 2.1.0")
   s.add_development_dependency("pry", "~> 0.10")

lib/github-pages/dependencies.rb

@@ -17,24 +17,24 @@ class Dependencies
       # Misc
       "liquid"                    => "4.0.0",
       "rouge"                     => "2.2.1",
-      "github-pages-health-check" => "1.8.1",
+      "github-pages-health-check" => "1.16.1",
 
       # Plugins
       "jekyll-redirect-from"   => "0.14.0",
       "jekyll-sitemap"         => "1.2.0",
-      "jekyll-feed"            => "0.10.0",
+      "jekyll-feed"            => "0.11.0",
       "jekyll-gist"            => "1.5.0",
       "jekyll-paginate"        => "1.1.0",
       "jekyll-coffeescript"    => "1.1.1",
       "jekyll-seo-tag"         => "2.5.0",
-      "jekyll-github-metadata" => "2.9.4",
+      "jekyll-github-metadata" => "2.12.1",
       "jekyll-avatar"          => "0.6.0",
       "jekyll-remote-theme"    => "0.3.1",
 
       # Plugins to match GitHub.com Markdown
-      "jemoji"                       => "0.10.1",
+      "jemoji"                       => "0.10.2",
       "jekyll-mentions"              => "1.4.1",
-      "jekyll-relative-links"        => "0.5.3",
+      "jekyll-relative-links"        => "0.6.0",
       "jekyll-optional-front-matter" => "0.3.0",
       "jekyll-readme-index"          => "0.2.0",
       "jekyll-default-layout"        => "0.1.4",

lib/github-pages/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitHubPages
-  VERSION = 192
+  VERSION = 197
 end

spec/github-pages/configuration_spec.rb

@@ -62,6 +62,10 @@
       expect(effective_config["exclude"]).to include("CNAME")
     end
 
+    it "retains Jekyll default excludes" do
+      expect(effective_config["exclude"]).to include(*Jekyll::Configuration::DEFAULTS["exclude"])
+    end
+
     context "markdown processor" do
       context "with no markdown processor set" do
         it "defaults to kramdown" do

spec/spec_helper.rb

@@ -2,6 +2,7 @@
 
 require File.expand_path("../lib/github-pages.rb", __dir__)
 require "open3"
+require "webmock/rspec"
 
 RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
@@ -12,6 +13,12 @@
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = "random"
+
+  # Stub all GitHub API requests so they come back empty.
+  config.before(:each) do
+    stub_request(:get, /api.github.com/)
+      .to_return(:status => 200, :body => "{}", :headers => {})
+  end
 end
 
 def fixture_dir