Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11

2020-10-17 17:53:47 +03:00 · 2020-10-17 17:53:47 +03:00 · 9ea31b373f
commit 9ea31b373f
parent a859d9bc15 023f726d7f
85 changed files with 393 additions and 314 deletions
--- a/lib/pleroma/application.ex
+++ b/lib/pleroma/application.ex
@ -95,6 +95,7 @@ defmodule Pleroma.Application do
        [
          Pleroma.Stats,
          Pleroma.JobQueueMonitor,
+          {Majic.Pool, [name: Pleroma.MajicPool, pool_size: Config.get([:majic_pool, :size], 2)]},
          {Oban, Config.get(Oban)}
        ] ++
        task_children(@env) ++