logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: ad608373005036a1181474ec446ed9d882385248
parent: 03d89e182e0323f775232a4ddab66615f39dc765
Author: kaniini <ariadne@dereferenced.org>
Date:   Tue, 23 Jul 2019 19:14:16 +0000

Merge branch 'patch-2' into 'develop'

Update `prometheus_phoenix` to v1.3 in order to support `phoenix@1.4`.

Closes #1050

See merge request pleroma/pleroma!1475

Diffstat:

Mmix.exs2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mix.exs b/mix.exs @@ -143,7 +143,7 @@ defmodule Pleroma.Mixfile do {:telemetry, "~> 0.3"}, {:prometheus_ex, "~> 3.0"}, {:prometheus_plugs, "~> 1.1"}, - {:prometheus_phoenix, "~> 1.2"}, + {:prometheus_phoenix, "~> 1.3"}, {:prometheus_ecto, "~> 1.4"}, {:recon, github: "ferd/recon", tag: "2.4.0"}, {:quack, "~> 0.1.1"},