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

diff --cc config/config.exs
index 7ca5d0c874fbbecd0548e926232dc29975406697,cdbce650452f689b5728fae01fe1c6f2707ca8d0..3462a37f76b3a6fd3517a4de4c2fbfcd3cc08f11
--- 1/config/config.exs
--- 2/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 357f12e5d6cdff35bc6e51367c6b23b24602b9a2,7e7fa754a994de3fcdc24f5ce4e0d3333114aa0f..b5ea587463c91657221bc2a2cd231ae6067816ea
--- 1/docs/config.md
--- 2/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: