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
2019-07-23 19:14:16 +00:00 · 2019-07-23 19:14:16 +00:00 · ad60837300
commit ad60837300
parent 03d89e182e 2e697f87f4
1 changed files with 1 additions and 1 deletions
--- 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"},