Merge branch 'develop' into issue/1790-updated-oban

2020-07-10 11:34:53 -05:00 · 2020-07-10 11:34:53 -05:00 · 3c0c1fd2ef
commit 3c0c1fd2ef
parent d7a37fddd1 ce9514000d
220 changed files with 3840 additions and 1938 deletions
--- a/mix.exs
+++ b/mix.exs
@ -178,6 +178,7 @@ defmodule Pleroma.Mixfile do
       ref: "293d77bb6f4a67ac8bde1428735c3b42f22cbb30"},
      {:telemetry, "~> 0.3"},
      {:poolboy, "~> 1.5"},
+      {:prometheus, "~> 4.6"},
      {:prometheus_ex, "~> 3.0"},
      {:prometheus_plugs, "~> 1.1"},
      {:prometheus_phoenix, "~> 1.3"},