summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2020-06-26 10:23:19 -0500
committerMark Felder <feld@FreeBSD.org>2020-06-26 10:23:19 -0500
commitb950fb01db51f14a9fd3a827b90573418a5b95da (patch)
tree7b04f584b8b371f0a99f0b8be52d8f0875778ec8 /config
parent433c01b370f4bf68d3f016d86c1527b1319e7a0c (diff)
parent6db9f7cdb3adeda547b6e3e9ca887b685344351a (diff)
downloadpleroma-b950fb01db51f14a9fd3a827b90573418a5b95da.tar.gz
pleroma-b950fb01db51f14a9fd3a827b90573418a5b95da.zip
Merge branch 'develop' into refactor/notification_settings
Diffstat (limited to 'config')
-rw-r--r--config/config.exs8
1 files changed, 8 insertions, 0 deletions
diff --git a/config/config.exs b/config/config.exs
index 5aad26e95..5b1c576e7 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -434,6 +434,14 @@ config :pleroma, Pleroma.Web.Metadata,
],
unfurl_nsfw: false
+config :pleroma, Pleroma.Web.Preload,
+ providers: [
+ Pleroma.Web.Preload.Providers.Instance,
+ Pleroma.Web.Preload.Providers.User,
+ Pleroma.Web.Preload.Providers.Timelines,
+ Pleroma.Web.Preload.Providers.StatusNet
+ ]
+
config :pleroma, :http_security,
enabled: true,
sts: false,