summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMaxim Filippov <colixer@gmail.com>2019-11-14 23:45:29 +0900
committerMaxim Filippov <colixer@gmail.com>2019-11-14 23:45:29 +0900
commit114930b5fd816657c21c5fbe33845fd3742c9c23 (patch)
tree8048239cc3562033dba47db9308159c25a177c18 /config
parent30af5da33043192dff626e869f2628ffc709f836 (diff)
parent09b4f7269e5307f29fc8ca7b548e93cd93836dc5 (diff)
downloadpleroma-114930b5fd816657c21c5fbe33845fd3742c9c23.tar.gz
pleroma-114930b5fd816657c21c5fbe33845fd3742c9c23.zip
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
Diffstat (limited to 'config')
-rw-r--r--config/config.exs4
1 files changed, 3 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs
index 54de8fa9f..75f463797 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -274,7 +274,7 @@ config :pleroma, :instance,
account_field_name_length: 512,
account_field_value_length: 2048,
external_user_synchronization: true,
- extended_nickname_format: false
+ extended_nickname_format: true
config :pleroma, :feed,
post_title: %{
@@ -605,6 +605,8 @@ config :pleroma, Pleroma.ActivityExpiration, enabled: true
config :pleroma, Pleroma.Plugs.RemoteIp, enabled: false
+config :pleroma, :static_fe, enabled: false
+
config :pleroma, :web_cache_ttl,
activity_pub: nil,
activity_pub_question: 30_000