From 80683dde4eeef5d54ef3ce149d641a9e726689af Mon Sep 17 00:00:00 2001
From: Ashwin Maroli <ashmaroli@gmail.com>
Date: Sun, 10 May 2020 12:11:49 +0530
Subject: [PATCH] Forward-port release history from stable branches

---
 History.markdown      | 26 +++++++++++++++++++++-----
 docs/_docs/history.md | 27 +++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/History.markdown b/History.markdown
index 699e2c0a..cf6c2734 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,9 +1,5 @@
 ## HEAD
 
-### release
-
-  * Jekyll v4.0 release (#7782)
-
 ### Bug Fixes
 
   * Memoize absolute_url and relative_url filters (#7793)
@@ -45,7 +41,7 @@
   * Update old GitHub wiki URL with new one (#7823)
   * Update JekyllConf page with 2019 talks (#7826)
   * link for memberships (#7825)
-  * Doc: minor fix, should be greater or equal to min version [ci skip] (#7856)
+  * Doc: minor fix, should be greater or equal to min version (#7856)
   * Update third-party.md - Fix broken link (#7857)
   * clarify _config.yml/collections type (#7873)
   * Replace `` with html tag (#7879)
@@ -134,6 +130,25 @@
   * Render tutorial metadata in documentation site (#8092)
   * Improve syntax-highlighting in documentation site (#8079)
 
+## 4.0.1 / 2020-05-08
+
+### Bug Fixes
+
+  * Prevent console warning with Ruby 2.7 (#8124)
+  * Clear cached Liquid template scope before render (#8141)
+  * Add static file's basename to its url_placeholder (#8142)
+  * Update item_property to recognize integers (#8160)
+
+### Development Fixes
+
+  * Fix Kramdown converter based tests for v4.0.x (#8143)
+
+## 3.8.7 / 2020-05-08
+
+### Bug Fixes
+
+  * Prevent console warnings with Ruby 2.7 (#8125)
+
 ## 4.0.0 / 2019-08-19
 
 ### Major Enhancements
@@ -420,6 +435,7 @@
 
 ### Release
 
+  * Jekyll v4.0 release (#7782)
   * Release post for v4.0.0 beta1 (#7716)
   * Release post for v4.0.0.pre.alpha1 (#7574)
   * Release post for v3.8.0 (#6849)
diff --git a/docs/_docs/history.md b/docs/_docs/history.md
index c4185b7a..b0d047e7 100644
--- a/docs/_docs/history.md
+++ b/docs/_docs/history.md
@@ -4,6 +4,32 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 4.0.1 / 2020-05-08
+{: #v4-0-1}
+
+### Bug Fixes
+{: #bug-fixes-v4-0-1}
+
+- Prevent console warning with Ruby 2.7 ([#8124]({{ site.repository }}/issues/8124))
+- Clear cached Liquid template scope before render ([#8141]({{ site.repository }}/issues/8141))
+- Add static file's basename to its url_placeholder ([#8142]({{ site.repository }}/issues/8142))
+- Update item_property to recognize integers ([#8160]({{ site.repository }}/issues/8160))
+
+### Development Fixes
+{: #development-fixes-v4-0-1}
+
+- Fix Kramdown converter based tests for v4.0.x ([#8143]({{ site.repository }}/issues/8143))
+
+
+## 3.8.7 / 2020-05-08
+{: #v3-8-7}
+
+### Bug Fixes
+{: #bug-fixes-v3-8-7}
+
+- Prevent console warnings with Ruby 2.7 ([#8125]({{ site.repository }}/issues/8125))
+
+
 ## 4.0.0 / 2019-08-19
 {: #v4-0-0}
 
@@ -296,6 +322,7 @@ note: This file is autogenerated. Edit /History.markdown instead.
 
 ### Release
 
+- Jekyll v4.0 release ([#7782]({{ site.repository }}/issues/7782))
 - Release post for v4.0.0 beta1 ([#7716]({{ site.repository }}/issues/7716))
 - Release post for v4.0.0.pre.alpha1 ([#7574]({{ site.repository }}/issues/7574))
 - Release post for v3.8.0 ([#6849]({{ site.repository }}/issues/6849))