projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mrf-config-descriptions' into 'develop'
[akkoma]
/
mix.exs
diff --git
a/mix.exs
b/mix.exs
index 427329d38d2ab51b0ff44d4d0dabc85de8030bc2..0691902a6fd257f17208838bc5a80c3f56c8aeea 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"},
@@
-134,7
+134,7
@@
defmodule Pleroma.Mixfile do
{:cachex, "~> 3.2"},
{:poison, "~> 3.0", override: true},
{:tesla,
{:cachex, "~> 3.2"},
{:poison, "~> 3.0", override: true},
{:tesla,
- git: "https://github.com/teamon/tesla
/
",
+ git: "https://github.com/teamon/tesla
.git
",
ref: "9f7261ca49f9f901ceb73b60219ad6f8a9f6aa30",
override: true},
{:castore, "~> 0.1"},
ref: "9f7261ca49f9f901ceb73b60219ad6f8a9f6aa30",
override: true},
{:castore, "~> 0.1"},
@@
-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"},
@@
-189,7
+196,7
@@
defmodule Pleroma.Mixfile do
ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"},
{:restarter, path: "./restarter"},
{:majic,
ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"},
{:restarter, path: "./restarter"},
{:majic,
- git: "https://git.pleroma.social/pleroma/elixir-libraries/majic", branch: "develop"},
+ git: "https://git.pleroma.social/pleroma/elixir-libraries/majic
.git
", branch: "develop"},
{:open_api_spex,
git: "https://git.pleroma.social/pleroma/elixir-libraries/open_api_spex.git",
ref: "f296ac0924ba3cf79c7a588c4c252889df4c2edd"},
{:open_api_spex,
git: "https://git.pleroma.social/pleroma/elixir-libraries/open_api_spex.git",
ref: "f296ac0924ba3cf79c7a588c4c252889df4c2edd"},