Merge branch 'master' into patch-1

2020-09-25 12:41:19 -03:00 · 2020-09-25 12:41:19 -03:00 · a91f1157d0
parent 334a671df0 ae6ce57b36
commit a91f1157d0
3 changed files with 3 additions and 1 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -14,5 +14,5 @@ env:
  global:
    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
  matrix:
-    - JEKYLL_VERSION="~> 3.8"
+    - JEKYLL_VERSION="~> 3.9"
    - JEKYLL_VERSION="~> 4.0"
--- a/1
+++ b/1
@ -5,3 +5,4 @@ source "https://rubygems.org"
 gemspec

 gem "jekyll", ENV["JEKYLL_VERSION"] if ENV["JEKYLL_VERSION"]
+gem "kramdown-parser-gfm" if ENV["JEKYLL_VERSION"] == "~> 3.9"
--- a/History.markdown
+++ b/History.markdown
@ -28,6 +28,7 @@
 ### Bug Fixes

  * Reduce allocations of instance-agnostic objects (#376)
+  * Fix Travis builds for Jekyll 3.x (#415)

 ## 2.6.1 / 2019-05-17