Merge branch 'bugfix/elixir-1.14' into 'develop'

Bugfix: Elixir 1.14

See merge request pleroma/pleroma!3740
This commit is contained in:
Haelwenn 2022-09-27 21:46:03 +00:00
commit 5d7d623390
5 changed files with 16 additions and 12 deletions

View file

@ -167,8 +167,8 @@ defmodule Pleroma.Mixfile do
{:poolboy, "~> 1.5"},
{:prometheus, "~> 4.6"},
{:prometheus_ex,
git: "https://git.pleroma.social/pleroma/elixir-libraries/prometheus.ex.git",
ref: "a4e9beb3c1c479d14b352fd9d6dd7b1f6d7deee5",
git: "https://github.com/lanodan/prometheus.ex.git",
branch: "fix/elixir-1.14",
override: true},
{:prometheus_plugs, "~> 1.1"},
{:prometheus_phoenix, "~> 1.3"},