aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-07-23 19:14:16 +0000
committerkaniini <ariadne@dereferenced.org>2019-07-23 19:14:16 +0000
commitad608373005036a1181474ec446ed9d882385248 (patch)
treef9986ae0c8e9e5b4d3907805cf6fdba681d415b7
parent03d89e182e0323f775232a4ddab66615f39dc765 (diff)
parent2e697f87f45f2982b53c4a0ec73f14526b6f8cf4 (diff)
downloadpleroma-ad608373005036a1181474ec446ed9d882385248.tar.gz
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
-rw-r--r--mix.exs2
1 files changed, 1 insertions, 1 deletions
diff --git a/mix.exs b/mix.exs
index c12b0a500..e69940c5d 100644
--- 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"},