diff options
| author | Starfall <us@starfall.systems> | 2020-12-01 10:50:41 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2020-12-01 10:50:41 -0600 |
| commit | 63f2eb0c84d0c51f7ece341cc3f35518a3d69520 (patch) | |
| tree | 57d362f393ff7ae7fdf6b4a00d654f8dbd9c9d7c /app/models/account.rb | |
| parent | 19548d0a4bc303ca8017599577e21a6d522eb7bd (diff) | |
| parent | 29812c2e59e02ea5ff8e4818a38b59944e2367ba (diff) | |
Merge branch 'glitch' into main
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 |