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

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

c3d5c3513a3205313f0a2e28bb328ad5b48f2055
diff --cc config/config.exs
index 0a80287ae,8a977ece5..7ca5d0c87
--- a/config/config.exs
+++ b/config/config.exs
@@@ -361,8 -361,8 +361,9 @@@ config :pleroma, Pleroma.Web.Federator.
  config :pleroma_job_queue, :queues,
    federator_incoming: 50,
    federator_outgoing: 50,
 +  web_push: 50,
-   mailer: 10
+   mailer: 10,
+   scheduled_activities: 10
  
  config :pleroma, :fetch_initial_posts,
    enabled: false,
diff --cc docs/config.md
index 6f3119573,ba0759e87..357f12e5d
--- a/docs/config.md
+++ b/docs/config.md
@@@ -317,7 -317,7 +317,8 @@@ Pleroma has the following queues
  * `federator_outgoing` - Outgoing federation
  * `federator_incoming` - Incoming federation
  * `mailer` - Email sender, see [`Pleroma.Mailer`](#pleroma-mailer)
 +* `web_push` - Web push notifications
+ * `scheduled_activities` - Scheduled activities, see [`Pleroma.ScheduledActivities`](#pleromascheduledactivity)
  
  Example: