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

diff --cc Gemfile.lock
index b70dd2502ce9ad1e8860be79d7b8910e919bd8ec,a9a1d1c2439e8293be7d382a45289c0e3f5265c9..13f6bed594b1668d379124a267aed0ab14495c97
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -490,11 -490,10 +490,11 @@@ GE
        link_header (~> 0.0, >= 0.0.8)
      rdf-normalize (0.4.0)
        rdf (~> 3.1)
 +    redcarpet (3.5.0)
      redis (4.1.3)
-     redis-actionpack (5.0.2)
-       actionpack (>= 4.0, < 6)
-       redis-rack (>= 1, < 3)
+     redis-actionpack (5.2.0)
+       actionpack (>= 5, < 7)
+       redis-rack (>= 2.1.0, < 3)
        redis-store (>= 1.1.0, < 2)
      redis-activesupport (5.0.4)
        activesupport (>= 3, < 6)

diff --cc app/javascript/styles/mastodon/components.scss
Simple merge

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge