Merge changes from upstream

.github/issue_template.md

@@ -1,3 +1,3 @@
 Please only submit feature suggestions or bug reports if you believe something is broken.
 
-If you need help, or if you enjoy Beautiful Jekyll and want to support it, please upgrade to one of our plans: https://beautifuljekyll.com/plans/
+If you need help, you can attend the [Office Hours](https://beautifuljekyll.com/officehours) (only available for [sponsors](https://beautifuljekyll.com/plans/)).

.github/workflows/ci.yml

@@ -5,7 +5,7 @@ jobs:
     name: Build Jekyll
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Build the site in the jekyll/builder container
         run: |
           export JEKYLL_VERSION=3.8

CHANGELOG.md

@@ -1,27 +1,54 @@
 ## Unreleased version
+- BREAKING CHANGE: Allow changing the order of the social network links that appear in the footer (#1152)
+- BREAKING CHANGE: `google-scholar` social network link no longer requires the prefix `citations?user=`; if you previously set this parameter, it needs to be updated (#1189)
+- The footer of a page always sticks to the bottom, even on short pages (#576)
+- Added `author` YAML parameter to allow specifying the author(s) of a post (#1220)
+- Fixed bug where hovering over search results showed the text "{desc}" (#1156)
+- Added social network links for GitLab, Bluesky (#1168, #1218)
+- Added instructions and example on how to fix image links in project sites (#1171)
+- Pagination buttons: use nicer arrows, and don't show text on small screens (#1221)
+
+## v6.0.1 (2023-06-08)
+
+This version has been in the works for a few years. It includes several new features that were highly requested, numerous bug fixes, new documentation, and aggresively encourages migrating from the old Google Universal Analytics to the new Analytics 4.
+
+#### Breaking changes
+
+- As of July 2023, Google Universal Analytics is going away and being replaced by Google Analytics 4. Beautiful Jekyll sites that still use the old analytics tag will show a warning to encourage them to move to Analytics 4 (#1096).
+- More control over RSS feed sharing: previously, an RSS feed was *always* generated, and if the config setting `rss-description` was set then there was an RSS icon in the footer. Now, an RSS feed is only generated when the config setting `rss-description` exists, and an RSS footer icon is only shown if `rss: true` is set in the `social-network-links` config settings.
+
+#### New parameters and settings
 
 - Added `navbar-var-length` config setting that allows the navigation menu to be the same length as the longest sub-menu, so that long words in the submenu are not cut off (#765) 
-- Added `post_search` config setting that creates a Search button in the navbar (older websites need to set `post_search: true` to enable this feature) (#770)
+- Added `post_search` config setting that creates a Search button in the navbar (#770)
 - Added `edit_page_button` config setting that adds a "Edit page" button to the footer (to edit the current page on GitHub) (#1004)
-- BREAKING CHANGE: More control over RSS feed sharing: previously, an RSS feed was *always* generated, and if the config setting `rss-description` was set then there was an RSS icon in the footer. Now, an RSS feed is only generated when the config setting `rss-description` exists, and an RSS footer icon is only shown if `rss: true` is set in the `social-network-links` config settings 
+- Added `footer-hover-col` config setting to customize the hover colour of links in the footer (#848)
+
+#### New features and improvements
+
+- Made the home page feed more accessible for screen readers (#950)
+- Added support for giscus comments (#886) and CommentBox (#960)
+- Added support for Cloudflare Analytics (#797)
+- Added Reddit in share options of posts (#815)
+
+#### Bug fixes
+
 - Fixed page titles, subtitles, and excerpts rendering correctly when there are special characeters in them (#856) 
-- Slightly reworked margins and position for avatar image to resolve an alignment issue on Safari.
-- Changed the width at which the navbar collapses to a higher threshold because most modern non-mobile browsers are >1000px
 - Fixed bug where navbar secondary level dropdown items didn't inherit the same colour as the primary navbar links
 - Fixed bug where the navbar "burger" collapsed button didn't always revert back to a light colour
 - Fixed bug where using an image as a navbar title did not render in GitHub Project pages that did not have a custom domain
-- Fixed issue where image thumbnails on the feed page were always forced into a square rather than maintaining a proper image aspect ratio
-- Added support for Patreon, Medium, and Itch.io in the social network links in the footer (#783, #788)
+- Fixed bug where image thumbnails on the feed page were always forced into a square rather than maintaining a proper image aspect ratio
 - Fixed bug where special characters in the title led to broken share tags (#744)
-- Updated staticman from using v2 (public servers) to v3 (private servers) due to the public servers becoming obsolete (#775)
-- Added support for Cloudflare Analytics (#797)
-- Added Reddit in share options of posts (#815)
-- Added support for giscus comments (#886) and CommentBox (#960)
 - Fixed bug where staticman didn't work jQuery slim version is used (#766)
 - Fixed very long strings to wrap around the next line rather than go off-screen (#787)
-- Added `footer-hover-col` config setting to customize the hover colour of links in the footer (#848)
-- Added social network links for Discord (#907), Kaggle (#961), and Hackerrank (#978)
-- Made the home page feed more accessible for screen readers (#950) 
+
+#### Small changes
+
+- Updated staticman from using v2 (public servers) to v3 (private servers) due to the public servers becoming obsolete (#775)
+- Added social network links for Patreon, Medium, Itch.io, Discord, Kaggle, Hackerrank (#783, #788, #907, #961, #978)
+- Slightly reworked margins and position for avatar image to resolve an alignment issue on Safari
+- Changed the width at which the navbar collapses to a higher threshold because most modern non-mobile browsers are >1000px
+
 
 ## v5.0.0 (2020-09-15)
 
@@ -68,7 +95,6 @@ One of the major changes in this version is that a lot of time was spent on reth
 - Upgraded kramdown to version 2.3.0 to fix security issues
 - Upgraded jQuery to version 3.5.1 to fix a couple security vulnerabilities with the previous version
 
-
 ## v4.1.0 (2020-08-08)
 
 - Added Open Graph `site_name` meta field to pages automatically

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Dean Attali
+Copyright (c) 2023 Dean Attali
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal