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

2019-04-08 16:46:59 +07:00 · 2019-04-08 16:46:59 +07:00 · c3d5c3513a
commit c3d5c3513a
parent a1a854646e b177e1e7f3
17 changed files with 786 additions and 8 deletions
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@ -104,7 +104,8 @@ defmodule Pleroma.Application do
          ],
          id: :cachex_idem
        ),
-        worker(Pleroma.FlakeId, [])
+        worker(Pleroma.FlakeId, []),
+        worker(Pleroma.ScheduledActivityWorker, [])
      ] ++
        hackney_pool_children() ++
        [