diff options
| author | ThibG <thib@sitedethib.com> | 2020-11-25 19:01:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-25 19:01:15 +0100 |
| commit | 29812c2e59e02ea5ff8e4818a38b59944e2367ba (patch) | |
| tree | 481dc4c0158a2def1e41f5998ef67a4e3707bb8b /app/models/account.rb | |
| parent | 24696458bf22c8529b49f89b2791e3e07583b7e0 (diff) | |
| parent | b9fc807115e83347ad7bb74cd3ff82841c35809a (diff) | |
Merge pull request #1468 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/account.rb')
| -rw-r--r-- | app/models/account.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 641e984cd..87b89df51 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -67,6 +67,7 @@ class Account < ApplicationRecord 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 |