summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorlambda <lain@soykaf.club>2019-05-06 16:45:22 +0000
committerlambda <lain@soykaf.club>2019-05-06 16:45:22 +0000
commit4dabf64af45232afdbbb15d9a697a64e15a749ee (patch)
tree6284b81c9cc888bae9159d76dab7aab6f0e57661 /config
parentd089ff24600455fefc17e91807c61ddc61ba107a (diff)
parentce6ca0fefe7feb1c31447287aec117d40233652a (diff)
downloadpleroma-4dabf64af45232afdbbb15d9a697a64e15a749ee.tar.gz
pleroma-4dabf64af45232afdbbb15d9a697a64e15a749ee.zip
Merge branch 'feature/845-improve-status-deletion' into 'develop'
Improve status deletion Closes #845 See merge request pleroma/pleroma!1104
Diffstat (limited to 'config')
-rw-r--r--config/config.exs6
1 files changed, 4 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs
index 1a9738cff..12dbe9941 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -232,7 +232,8 @@ config :pleroma, :instance,
welcome_message: nil,
max_report_comment_size: 1000,
safe_dm_mentions: false,
- healthcheck: false
+ healthcheck: false,
+ repo_batch_size: 500
config :pleroma, :markup,
# XXX - unfortunately, inline images must be enabled by default right now, because
@@ -416,7 +417,8 @@ config :pleroma_job_queue, :queues,
web_push: 50,
mailer: 10,
transmogrifier: 20,
- scheduled_activities: 10
+ scheduled_activities: 10,
+ background: 5
config :pleroma, :fetch_initial_posts,
enabled: false,