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

[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth

Browse source 
# Conflicts:
#	mix.exs
This commit is contained in:
Ivan Tashkinov 2019-04-01 08:49:32 +03:00
commit baffdcc480
62 changed files with 3130 additions and 622 deletions
Download patch file Download diff file Expand all files Collapse all files

8
config/config.exs
View file

@ -348,10 +348,10 @@ config :pleroma, Pleroma.Web.Federator.RetryQueue,
initial_timeout: 30,
max_retries: 5
config :pleroma, Pleroma.Jobs,
federator_incoming: [max_jobs: 50],
federator_outgoing: [max_jobs: 50],
mailer: [max_jobs: 10]
config :pleroma_job_queue, :queues,
federator_incoming: 50,
federator_outgoing: 50,
mailer: 10
config :pleroma, :fetch_initial_posts,
enabled: false,