From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Mon, 8 Apr 2019 11:48:10 +0000 (+0700)
Subject: Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=9abf832b034bf3867272bd178d168c641129eff0;p=akkoma

Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
---

9abf832b034bf3867272bd178d168c641129eff0
diff --cc config/config.exs
index 7ca5d0c87,cdbce6504..3462a37f7
--- a/config/config.exs
+++ b/config/config.exs
@@@ -361,8 -367,8 +367,9 @@@ config :pleroma, Pleroma.Web.Federator.
  config :pleroma_job_queue, :queues,
    federator_incoming: 50,
    federator_outgoing: 50,
 +  web_push: 50,
    mailer: 10,
+   transmogrifier: 20,
    scheduled_activities: 10
  
  config :pleroma, :fetch_initial_posts,
diff --cc docs/config.md
index 357f12e5d,7e7fa754a..b5ea58746
--- a/docs/config.md
+++ b/docs/config.md
@@@ -317,7 -318,7 +318,8 @@@ Pleroma has the following queues
  * `federator_outgoing` - Outgoing federation
  * `federator_incoming` - Incoming federation
  * `mailer` - Email sender, see [`Pleroma.Mailer`](#pleroma-mailer)
+ * `transmogrifier` - Transmogrifier
 +* `web_push` - Web push notifications
  * `scheduled_activities` - Scheduled activities, see [`Pleroma.ScheduledActivities`](#pleromascheduledactivity)
  
  Example: