Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

[akkoma] / mix.exs

diff --git a/mix.exs b/mix.exs
index eb2e54e4ab0575afff184726cfbf55e8b017766a..8d803ccffe3babafb98f4dac98c0e43963c650d9 100644 (file)
--- a/mix.exs
+++ b/mix.exs
@@ -100,7 +100,8 @@ defmodule Pleroma.Mixfile do
       {:plug_cowboy, "~> 2.0"},
       {:phoenix_pubsub, "~> 1.1"},
       {:phoenix_ecto, "~> 4.0"},
-      {:ecto_sql, "~> 3.2"},
+      {:ecto_enum, "~> 1.4"},
+      {:ecto_sql, "~> 3.3.2"},
       {:postgrex, ">= 0.13.5"},
       {:oban, "~> 0.12.0"},
       {:quantum, "~> 2.3"},
@@ -123,7 +124,7 @@ defmodule Pleroma.Mixfile do
       {:earmark, "~> 1.3"},
       {:bbcode, "~> 0.1.1"},
       {:ex_machina, "~> 2.3", only: :test},
-      {:credo, "~> 0.9.3", only: [:dev, :test]},
+      {:credo, "~> 1.1.0", only: [:dev, :test], runtime: false},
       {:mock, "~> 0.3.3", only: :test},
       {:crypt,
        git: "https://github.com/msantos/crypt", ref: "1f2b58927ab57e72910191a7ebaeff984382a1d3"},
@@ -162,7 +163,11 @@ defmodule Pleroma.Mixfile do
       {:remote_ip,
        git: "https://git.pleroma.social/pleroma/remote_ip.git",
        ref: "825dc00aaba5a1b7c4202a532b696b595dd3bcb3"},
-      {:mox, "~> 0.5", only: :test}
+      {:captcha,
+       git: "https://git.pleroma.social/pleroma/elixir-libraries/elixir-captcha.git",
+       ref: "e0f16822d578866e186a0974d65ad58cddc1e2ab"},
+      {:mox, "~> 0.5", only: :test},
+      {:mrfcontrib, git: "https://github.com/FloatingGhost/pleroma-mrf-contrib.git", tag: "v0.0.5"}
     ] ++ oauth_deps()
   end