summaryrefslogtreecommitdiff
path: root/config/config.exs
diff options
context:
space:
mode:
authorIvan Tashkinov <ivant.business@gmail.com>2019-04-01 08:49:32 +0300
committerIvan Tashkinov <ivant.business@gmail.com>2019-04-01 08:49:32 +0300
commitbaffdcc480cea13269ef0e3af58f0a848892bb9a (patch)
treea9499083c412b24173fa14717cec7041c6f3f45c /config/config.exs
parent642075b1a935c42181a10ea695b2289883126136 (diff)
parentdc39d8d3fb941bad9fe26586c321bb00a0b92fe4 (diff)
downloadpleroma-baffdcc480cea13269ef0e3af58f0a848892bb9a.tar.gz
pleroma-baffdcc480cea13269ef0e3af58f0a848892bb9a.zip
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts: # mix.exs
Diffstat (limited to 'config/config.exs')
-rw-r--r--config/config.exs8
1 files changed, 4 insertions, 4 deletions
diff --git a/config/config.exs b/config/config.exs
index d8378a162..2dc87a50c 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -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,