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

Conflicts:
- `Gemfile.lock`: not a real conflict, upstream update too close
  to a glitch-soc-specific dependency

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
index e4900dc68f1b6af7ae9364b1c1a0a230703394c1,af770f43502a7e2266a027432cc1311bf84b158b..b47ab009111f01d2dc00795c0be593aa95bb9ec8
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -490,8 -490,7 +490,8 @@@ GE
        link_header (~> 0.0, >= 0.0.8)
      rdf-normalize (0.4.0)
        rdf (~> 3.1)
-     redis (4.1.4)
 +    redcarpet (3.5.0)
+     redis (4.2.1)
      redis-actionpack (5.2.0)
        actionpack (>= 5, < 7)
        redis-rack (>= 2.1.0, < 3)
@@@ -766,8 -765,7 +766,8 @@@ DEPENDENCIE
    rails-i18n (~> 5.1)
    rails-settings-cached (~> 0.6)
    rdf-normalize (~> 0.4)
-   redis (~> 4.1)
 +  redcarpet (~> 3.4)
+   redis (~> 4.2)
    redis-namespace (~> 1.7)
    redis-rails (~> 5.0)
    rqrcode (~> 1.1)

diff --cc app/javascript/mastodon/locales/defaultMessages.json
Simple merge

diff --cc app/javascript/mastodon/locales/en.json
Simple merge

diff --cc app/javascript/mastodon/locales/ja.json
Simple merge

diff --cc app/javascript/mastodon/locales/pl.json
Simple merge

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

diff --cc package.json
Simple merge

diff --cc yarn.lock
Simple merge