From 3e780634c03608e3bdfbdae9711b98ee4278c07d Mon Sep 17 00:00:00 2001
From: Franck Nijhof <frenck@frenck.nl>
Date: Tue, 3 Sep 2019 10:47:40 +0200
Subject: [PATCH] Full commonmark + general upgrades (#10275)

---
 Gemfile      |  4 ++--
 Gemfile.lock | 24 ++++++++++--------------
 _config.yml  |  4 +++-
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/Gemfile b/Gemfile
index f2442002bbc..2f27c87fa72 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,8 +15,8 @@ group :jekyll_plugins do
   gem 'jekyll-redirect-from', '0.15.0'
   gem 'jekyll-sitemap', '1.3.1'
   gem 'jekyll-time-to-read', '0.1.2'
-  gem 'jekyll-commonmark-ghpages', '0.1.6'
+  gem 'jekyll-commonmark', '1.3.1'
 end
 
-gem 'sinatra', '2.0.6'
+gem 'sinatra', '2.0.7'
 gem 'nokogiri', '1.10.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5dff2c22f4f..baa5809420a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,11 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     chunky_png (1.3.11)
     colorator (1.1.0)
-    commonmarker (0.17.13)
+    commonmarker (0.20.1)
       ruby-enum (~> 0.5)
     compass (1.0.3)
       chunky_png (~> 1.2)
@@ -47,10 +47,6 @@ GEM
     jekyll-commonmark (1.3.1)
       commonmarker (~> 0.14)
       jekyll (>= 3.7, < 5.0)
-    jekyll-commonmark-ghpages (0.1.6)
-      commonmarker (~> 0.17.6)
-      jekyll-commonmark (~> 1.2)
-      rouge (>= 2.0, < 4.0)
     jekyll-paginate (1.1.0)
     jekyll-redirect-from (0.15.0)
       jekyll (>= 3.3, < 5.0)
@@ -78,9 +74,9 @@ GEM
       mini_portile2 (~> 2.4.0)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (3.1.1)
+    public_suffix (4.0.1)
     rack (2.0.7)
-    rack-protection (2.0.6)
+    rack-protection (2.0.7)
       rack
     rake (12.3.3)
     rb-fsevent (0.10.3)
@@ -94,12 +90,12 @@ GEM
     sass (3.4.25)
     sass-globbing (1.1.5)
       sass (>= 3.1)
-    sassc (2.1.0)
+    sassc (2.2.0)
       ffi (~> 1.9)
-    sinatra (2.0.6)
+    sinatra (2.0.7)
       mustermann (~> 1.0)
       rack (~> 2.0)
-      rack-protection (= 2.0.6)
+      rack-protection (= 2.0.7)
       tilt (~> 2.0)
     stringex (2.8.5)
     terminal-table (1.8.0)
@@ -113,7 +109,7 @@ PLATFORMS
 DEPENDENCIES
   compass (= 1.0.3)
   jekyll (= 4.0.0)
-  jekyll-commonmark-ghpages (= 0.1.6)
+  jekyll-commonmark (= 1.3.1)
   jekyll-paginate (= 1.1.0)
   jekyll-redirect-from (= 0.15.0)
   jekyll-sitemap (= 1.3.1)
@@ -121,7 +117,7 @@ DEPENDENCIES
   nokogiri (= 1.10.4)
   rake (= 12.3.3)
   sass-globbing (= 1.1.5)
-  sinatra (= 2.0.6)
+  sinatra (= 2.0.7)
   stringex (= 2.8.5)
 
 RUBY VERSION
diff --git a/_config.yml b/_config.yml
index 4d22effbcff..a761210bc62 100644
--- a/_config.yml
+++ b/_config.yml
@@ -39,9 +39,11 @@ liquid:
   error_mode: strict
 
 commonmark:
-  options: ["SMART", "FOOTNOTES"]
+  options: ["SMART", "FOOTNOTES", "UNSAFE"]
   extensions: ["strikethrough", "autolink", "table"]
 
+highlighter: none
+
 plugins:
   - jekyll-redirect-from
   - jekyll-time-to-read