hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion

Browse source
This commit is contained in:
Alexander Strizhakov 2019-05-06 16:45:22 +00:00 • committed by lambda
commit ce6ca0fefe
9 changed files with 40 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
config/config.exs
View file

@ -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,