projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
favicon: Update to pleroma logo, provided by @shpuld
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index 427329d38d2ab51b0ff44d4d0dabc85de8030bc2..e0da696ce0aee1da4cadb6f6d07399f7e8de3a9e 100644
(file)
--- a/
mix.exs
+++ b/
mix.exs
@@
-114,10
+114,10
@@
defmodule Pleroma.Mixfile do
# Type `mix help deps` for examples and options.
defp deps do
[
# Type `mix help deps` for examples and options.
defp deps do
[
- {:phoenix, "~> 1.
4.17
"},
+ {:phoenix, "~> 1.
5.5
"},
{:tzdata, "~> 1.0.3"},
{:plug_cowboy, "~> 2.3"},
{:tzdata, "~> 1.0.3"},
{:plug_cowboy, "~> 2.3"},
- {:phoenix_pubsub, "~>
1.1
"},
+ {:phoenix_pubsub, "~>
2.0
"},
{:phoenix_ecto, "~> 4.0"},
{:ecto_enum, "~> 1.4"},
{:ecto_sql, "~> 3.4.4"},
{:phoenix_ecto, "~> 4.0"},
{:ecto_enum, "~> 1.4"},
{:ecto_sql, "~> 3.4.4"},
@@
-165,9
+165,16
@@
defmodule Pleroma.Mixfile do
{:telemetry, "~> 0.3"},
{:poolboy, "~> 1.5"},
{:prometheus, "~> 4.6"},
{:telemetry, "~> 0.3"},
{:poolboy, "~> 1.5"},
{:prometheus, "~> 4.6"},
- {:prometheus_ex, "~> 3.0"},
+ {:prometheus_ex,
+ git: "https://git.pleroma.social/pleroma/elixir-libraries/prometheus.ex.git",
+ ref: "a4e9beb3c1c479d14b352fd9d6dd7b1f6d7deee5",
+ override: true},
{:prometheus_plugs, "~> 1.1"},
{:prometheus_phoenix, "~> 1.3"},
{:prometheus_plugs, "~> 1.1"},
{:prometheus_phoenix, "~> 1.3"},
+ # Note: once `prometheus_phx` is integrated into `prometheus_phoenix`, remove the former:
+ {:prometheus_phx,
+ git: "https://git.pleroma.social/pleroma/elixir-libraries/prometheus-phx.git",
+ branch: "no-logging"},
{:prometheus_ecto, "~> 1.4"},
{:recon, "~> 2.5"},
{:quack, "~> 0.1.1"},
{:prometheus_ecto, "~> 1.4"},
{:recon, "~> 2.5"},
{:quack, "~> 0.1.1"},