diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-08-14 21:44:50 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-08-14 21:44:50 +0300 |
| commit | 8778c16dac1789eeb6dd51524573163216200b5d (patch) | |
| tree | 1f375b267c5c79b97eb2e12c2c343709705815ba /config | |
| parent | a180c1360ecdbed76eccf3435bb2c831356746bc (diff) | |
| parent | 4a5b0965a0d07d45bfc4687c80c752ec824457cc (diff) | |
| download | pleroma-8778c16dac1789eeb6dd51524573163216200b5d.tar.gz pleroma-8778c16dac1789eeb6dd51524573163216200b5d.zip | |
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
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 258e4d274..805176461 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: [], |