diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-08-14 22:45:32 +0000 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-08-14 22:45:32 +0000 |
| commit | ec969eec5149c5fe2a3e676ea07384b4597487f1 (patch) | |
| tree | b725022b93c7f354116e50d54009e0dc5dc19eaf /config | |
| parent | b27fafe161241c954b713281bebd6ffe1e990884 (diff) | |
| parent | 27b747546a7796de57e88f454b2c2810c7523f97 (diff) | |
| download | pleroma-ec969eec5149c5fe2a3e676ea07384b4597487f1.tar.gz pleroma-ec969eec5149c5fe2a3e676ea07384b4597487f1.zip | |
Merge branch 'develop' into 'fix/admin-api-user-deletion'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index d2325edbc..758661120 100644 --- a/config/config.exs +++ b/config/config.exs @@ -253,6 +253,8 @@ config :pleroma, :instance, skip_thread_containment: true, limit_to_local_content: :unauthenticated, dynamic_configuration: false, + user_bio_length: 5000, + user_name_length: 100, external_user_synchronization: true config :pleroma, :markup, @@ -302,7 +304,6 @@ config :pleroma, :assets, default_mascot: :pleroma_fox_tan config :pleroma, :activitypub, - accept_blocks: true, unfollow_blocked: true, outgoing_blocks: true, follow_handshake_timeout: 500, @@ -337,6 +338,10 @@ config :pleroma, :mrf_keyword, config :pleroma, :mrf_subchain, match_actor: %{} +config :pleroma, :mrf_vocabulary, + accept: [], + reject: [] + config :pleroma, :rich_media, enabled: true, ignore_hosts: [], |