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

Conflicts:
- `Gemfile.lock`:
  glitch-soc-only dependency textually too close to updated upstream
  dependencies. Updated to upsteam dependencies.

diff --cc Gemfile
Simple merge

diff --cc Gemfile.lock
index 341e9c4bc5eb4baa831c769e70f91a2a1d8b8449,b8134a985edd507afbe2d7e93643f06fc2ad3f0a..f32fdec5f2573e599cd7edc875c34901ed0563f7
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -478,8 -478,7 +478,8 @@@ GE
        link_header (~> 0.0, >= 0.0.8)
      rdf-normalize (0.4.0)
        rdf (~> 3.1)
-     redis (4.2.2)
 +    redcarpet (3.5.0)
+     redis (4.2.5)
      redis-actionpack (5.2.0)
        actionpack (>= 5, < 7)
        redis-rack (>= 2.1.0, < 3)

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

diff --cc app/models/account.rb
index 641e984cd2e7d03e0230537e817299fccd6d1a4c,f794d8a2965114384c2e52ba0125092029775441..87b89df512cabc9bf4516fe95ad21c4b9514e1cb
--- 1/app/models/account.rb
--- 2/app/models/account.rb
+++ b/app/models/account.rb
@@@ -67,11 -67,8 +67,12 @@@ class Account < ApplicationRecor
    include Paginable
    include AccountCounters
    include DomainNormalizable
+   include AccountMerging
  
 +  MAX_DISPLAY_NAME_LENGTH = (ENV['MAX_DISPLAY_NAME_CHARS'] || 30).to_i
 +  MAX_NOTE_LENGTH = (ENV['MAX_BIO_CHARS'] || 500).to_i
 +  MAX_FIELDS = (ENV['MAX_PROFILE_FIELDS'] || 4).to_i
 +
    TRUST_LEVELS = {
      untrusted: 0,
      trusted: 1,

diff --cc package.json
Simple merge

diff --cc streaming/index.js
Simple merge

diff --cc yarn.lock
Simple merge