Revert "Merge branch 'revert-4fabf83a' into 'develop'"

This reverts commit fe7fd33126, reversing changes made to 4fabf83ad0.
2019-09-16 17:03:37 +07:00 · 2019-09-16 17:03:37 +07:00 · 96816ceaa2
commit 96816ceaa2
parent 4397a3fe4a
26 changed files with 888 additions and 447 deletions
--- a/mix.exs
+++ b/mix.exs
@ -144,6 +144,7 @@ defmodule Pleroma.Mixfile do
       git: "https://git.pleroma.social/pleroma/http_signatures.git",
       ref: "293d77bb6f4a67ac8bde1428735c3b42f22cbb30"},
      {:telemetry, "~> 0.3"},
+      {:poolboy, "~> 1.5"},
      {:prometheus_ex, "~> 3.0"},
      {:prometheus_plugs, "~> 1.1"},
      {:prometheus_phoenix, "~> 1.3"},