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

diff --cc config/config.exs
index 0a80287ae5b6003d9f7f25afc65cf9e54fb9e16d,8a977ece5d5089a60ff33b8c2956dea3555a0e03..7ca5d0c874fbbecd0548e926232dc29975406697
--- 1/config/config.exs
--- 2/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,
-   mailer: 10
 +  web_push: 50,
+   mailer: 10,
+   scheduled_activities: 10
  
  config :pleroma, :fetch_initial_posts,
    enabled: false,

diff --cc docs/config.md
index 6f31195737f65767a6effe0e76638f1e7a7cc56d,ba0759e87c8468a1e3aaf3092bfc5f285b32be36..357f12e5d6cdff35bc6e51367c6b23b24602b9a2
--- 1/docs/config.md
--- 2/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:
  

diff --cc lib/pleroma/application.ex
Simple merge