Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `Gemfile.lock`: upstream-updated dependency (redis) textually too close to
   glitch-specific one (redcarpet).
   Ported upstream change.

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
index 1fc65d31c638e80483d4a0582303cd4c2530380a,a78e2c8fd8cb816a65522f402ef722a371b28ab4..a4d258fd51869aaabde0da739672e5ea78f7d7f3
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -490,8 -485,7 +485,8 @@@ GE
        link_header (~> 0.0, >= 0.0.8)
      rdf-normalize (0.4.0)
        rdf (~> 3.1)
-     redis (4.2.5)
 +    redcarpet (3.5.1)
+     redis (4.3.1)
      redis-namespace (1.8.1)
        redis (>= 3.0.4)
      regexp_parser (2.1.1)
@@@ -769,8 -762,7 +763,8 @@@ DEPENDENCIE
    rails-i18n (~> 6.0)
    rails-settings-cached (~> 0.6)
    rdf-normalize (~> 0.4)
-   redis (~> 4.2)
 +  redcarpet (~> 3.5)
+   redis (~> 4.3)
    redis-namespace (~> 1.8)
    resolv (~> 0.1.0)
    rqrcode (~> 2.0)

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge