From dff8ef4cb559b4be1a92951cea8ce34c8e4969ff Mon Sep 17 00:00:00 2001 From: "Wilson E. Husin" Date: Wed, 11 Nov 2020 10:26:58 -0800 Subject: [PATCH 1/4] Remove contributors section We don't really want to maintain the list of active contributors, people can find out who we are from Kubernetes Slack #sonobuoy Signed-off-by: Wilson E. Husin --- site/index.html | 6 ------ 1 file changed, 6 deletions(-) diff --git a/site/index.html b/site/index.html index 0a3935dec..3060da172 100644 --- a/site/index.html +++ b/site/index.html @@ -180,9 +180,3 @@

Blog Highlights

- -
-
- {% include contributors.html %} -
-
\ No newline at end of file From 35dc86e50acbc530a14d36e24c0830bb85d411fa Mon Sep 17 00:00:00 2001 From: "Wilson E. Husin" Date: Fri, 13 Nov 2020 11:15:21 -0800 Subject: [PATCH 2/4] Update Jekyll Signed-off-by: Wilson E. Husin --- site/Gemfile.lock | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/site/Gemfile.lock b/site/Gemfile.lock index c70cdcb61..b11263bff 100644 --- a/site/Gemfile.lock +++ b/site/Gemfile.lock @@ -4,24 +4,24 @@ GEM addressable (2.7.0) public_suffix (>= 2.0.2, < 5.0) colorator (1.1.0) - concurrent-ruby (1.1.5) - em-websocket (0.5.1) + concurrent-ruby (1.1.7) + em-websocket (0.5.2) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) eventmachine (1.2.7) - ffi (1.11.3) + ffi (1.13.1) forwardable-extended (2.6.0) http_parser.rb (0.6.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.8.6) + jekyll (3.8.7) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) i18n (~> 0.7) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 2.0) - kramdown (>= 2.3.0) + kramdown (~> 1.14) liquid (~> 4.0) mercenary (~> 0.3.3) pathutil (~> 0.9) @@ -48,22 +48,20 @@ GEM jekyll (>= 3.3, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (2.3.0) - rexml + kramdown (1.17.0) liquid (4.0.3) - listen (3.2.0) + listen (3.3.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (4.0.1) - rb-fsevent (0.10.3) - rb-inotify (0.10.0) + public_suffix (4.0.6) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) ffi (~> 1.0) redcarpet (3.5.0) - rexml (3.2.4) - rouge (3.13.0) + rouge (3.25.0) safe_yaml (1.0.5) sass (3.7.4) sass-listen (~> 4.0.0) @@ -88,4 +86,4 @@ DEPENDENCIES redcarpet (~> 3.5) BUNDLED WITH - 2.0.2 + 2.1.4 From 031d60439b1371cc0231e1fe90017fd925826ddb Mon Sep 17 00:00:00 2001 From: "Wilson E. Husin" Date: Mon, 16 Nov 2020 14:46:17 -0800 Subject: [PATCH 3/4] Update Jekyll and therefore Kramdown Signed-off-by: Wilson E. Husin --- site/Gemfile | 4 ++-- site/Gemfile.lock | 46 ++++++++++++++++++++++++++-------------------- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/site/Gemfile b/site/Gemfile index 0018e23a0..26aa12cdb 100644 --- a/site/Gemfile +++ b/site/Gemfile @@ -1,5 +1,5 @@ source 'https://rubygems.org' -gem 'jekyll', '~> 3.8.6' +gem 'jekyll', '~> 4.0' gem 'jekyll-feed', '~> 0.13.0' gem 'jekyll-optional-front-matter', '~> 0.3.2' gem 'jekyll-paginate', '~> 1.1' @@ -9,4 +9,4 @@ gem 'jekyll-relative-links', '~> 0.6.1' gem 'jekyll-sitemap', '~> 1.4' gem 'jekyll-titles-from-headings', '~> 0.5.3' gem 'jekyll-seo-tag', '~> 2.6', '>= 2.6.1' -gem 'redcarpet', '~> 3.5' \ No newline at end of file +gem 'redcarpet', '~> 3.5' diff --git a/site/Gemfile.lock b/site/Gemfile.lock index b11263bff..16cb4314e 100644 --- a/site/Gemfile.lock +++ b/site/Gemfile.lock @@ -12,21 +12,23 @@ GEM ffi (1.13.1) forwardable-extended (2.6.0) http_parser.rb (0.6.0) - i18n (0.9.5) + i18n (1.8.5) concurrent-ruby (~> 1.0) - jekyll (3.8.7) + jekyll (4.1.1) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) - i18n (~> 0.7) - jekyll-sass-converter (~> 1.0) + i18n (~> 1.0) + jekyll-sass-converter (~> 2.0) jekyll-watch (~> 2.0) - kramdown (~> 1.14) + kramdown (~> 2.1) + kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.3.3) + mercenary (~> 0.4.0) pathutil (~> 0.9) - rouge (>= 1.7, < 4) + rouge (~> 3.0) safe_yaml (~> 1.0) + terminal-table (~> 1.8) jekyll-feed (0.13.0) jekyll (>= 3.7, < 5.0) jekyll-optional-front-matter (0.3.2) @@ -38,22 +40,25 @@ GEM jekyll (>= 3.3, < 5.0) jekyll-relative-links (0.6.1) jekyll (>= 3.3, < 5.0) - jekyll-sass-converter (1.5.2) - sass (~> 3.4) - jekyll-seo-tag (2.6.1) - jekyll (>= 3.3, < 5.0) + jekyll-sass-converter (2.1.0) + sassc (> 2.0.1, < 3.0) + jekyll-seo-tag (2.7.1) + jekyll (>= 3.8, < 5.0) jekyll-sitemap (1.4.0) jekyll (>= 3.7, < 5.0) jekyll-titles-from-headings (0.5.3) jekyll (>= 3.3, < 5.0) jekyll-watch (2.2.1) listen (~> 3.0) - kramdown (1.17.0) + kramdown (2.3.0) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) liquid (4.0.3) - listen (3.3.0) + listen (3.3.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) - mercenary (0.3.6) + mercenary (0.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (4.0.6) @@ -61,19 +66,20 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) redcarpet (3.5.0) + rexml (3.2.4) rouge (3.25.0) safe_yaml (1.0.5) - sass (3.7.4) - sass-listen (~> 4.0.0) - sass-listen (4.0.0) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + sassc (2.4.0) + ffi (~> 1.9) + terminal-table (1.8.0) + unicode-display_width (~> 1.1, >= 1.1.1) + unicode-display_width (1.7.0) PLATFORMS ruby DEPENDENCIES - jekyll (~> 3.8.6) + jekyll (~> 4.0) jekyll-feed (~> 0.13.0) jekyll-optional-front-matter (~> 0.3.2) jekyll-paginate (~> 1.1) From f91186487deb92e33b75a70eae284d8f87b5fb8a Mon Sep 17 00:00:00 2001 From: "Wilson E. Husin" Date: Mon, 16 Nov 2020 15:06:59 -0800 Subject: [PATCH 4/4] Use Kramdown instead of Redcarpet Signed-off-by: Wilson E. Husin --- .gitignore | 3 ++- site/Gemfile | 1 - site/Gemfile.lock | 2 -- site/_config.yml | 7 +++---- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 486c8252a..f9cddd06e 100644 --- a/.gitignore +++ b/.gitignore @@ -34,4 +34,5 @@ site/_site site/.sass-cache site/.jekyll site/.jekyll-metadata -site/.bundle \ No newline at end of file +site/.jekyll-cache +site/.bundle diff --git a/site/Gemfile b/site/Gemfile index 26aa12cdb..e23514a46 100644 --- a/site/Gemfile +++ b/site/Gemfile @@ -9,4 +9,3 @@ gem 'jekyll-relative-links', '~> 0.6.1' gem 'jekyll-sitemap', '~> 1.4' gem 'jekyll-titles-from-headings', '~> 0.5.3' gem 'jekyll-seo-tag', '~> 2.6', '>= 2.6.1' -gem 'redcarpet', '~> 3.5' diff --git a/site/Gemfile.lock b/site/Gemfile.lock index 16cb4314e..a758cdaf3 100644 --- a/site/Gemfile.lock +++ b/site/Gemfile.lock @@ -65,7 +65,6 @@ GEM rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) - redcarpet (3.5.0) rexml (3.2.4) rouge (3.25.0) safe_yaml (1.0.5) @@ -89,7 +88,6 @@ DEPENDENCIES jekyll-seo-tag (~> 2.6, >= 2.6.1) jekyll-sitemap (~> 1.4) jekyll-titles-from-headings (~> 0.5.3) - redcarpet (~> 3.5) BUNDLED WITH 2.1.4 diff --git a/site/_config.yml b/site/_config.yml index 009477e31..2c4e0f209 100644 --- a/site/_config.yml +++ b/site/_config.yml @@ -10,7 +10,9 @@ twitter: card: summary vm_logo: vm-logo.png gh_repo: https://github.com/vmware-tanzu/sonobuoy -markdown: redcarpet +markdown: kramdown +kramdown: + syntax_highlighter: rouge hero: background-color: med-blue footer: @@ -283,6 +285,3 @@ exclude: - CNAME - Runbook.docx - '*.sh' - -redcarpet: - extensions: ["no_intra_emphasis", "tables", "autolink", "strikethrough", "with_toc_data"]