From: Thibaut Girka <thib@sitedethib.com>
Date: Wed, 25 Nov 2020 14:31:45 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=e71b16ae2b5623dc664c79ffa7d96282af662c78;p=mastodon.git

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.
---

e71b16ae2b5623dc664c79ffa7d96282af662c78
diff --cc Gemfile.lock
index 341e9c4bc,b8134a985..f32fdec5f
--- a/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)
 +    redcarpet (3.5.0)
-     redis (4.2.2)
+     redis (4.2.5)
      redis-actionpack (5.2.0)
        actionpack (>= 5, < 7)
        redis-rack (>= 2.1.0, < 3)
diff --cc app/models/account.rb
index 641e984cd,f794d8a29..87b89df51
--- a/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,