From: lambda <lain@soykaf.club>
Date: Mon, 8 Apr 2019 09:18:01 +0000 (+0000)
Subject: Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=b4da2bc1d009ecca0d7821abe3577d1a920c41c0;p=akkoma

Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'

# Conflicts:
#   config/config.exs
#   docs/config.md
---

b4da2bc1d009ecca0d7821abe3577d1a920c41c0
diff --cc config/config.exs
index d68edafcb,8a977ece5..779d12886
--- a/config/config.exs
+++ b/config/config.exs
@@@ -352,7 -362,7 +362,8 @@@ config :pleroma_job_queue, :queues
    federator_incoming: 50,
    federator_outgoing: 50,
    mailer: 10,
-   transmogrifier: 20
++  transmogrifier: 20,
+   scheduled_activities: 10
  
  config :pleroma, :fetch_initial_posts,
    enabled: false,
diff --cc docs/config.md
index dd3cc3727,ba0759e87..22d2a3e7c
--- a/docs/config.md
+++ b/docs/config.md
@@@ -300,7 -317,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
+ * `scheduled_activities` - Scheduled activities, see [`Pleroma.ScheduledActivities`](#pleromascheduledactivity)
  
  Example: