Merge branch 'get-follow-requests-sql' into 'develop'

[akkoma] / mix.exs

diff --git a/mix.exs b/mix.exs
index ed6ca61354d8ca9909b2f2344e5125100a07a825..0fe9c6ec351dea854e4df59cbf23dc4a217ee860 100644 (file)
--- a/mix.exs
+++ b/mix.exs
@@ -26,6 +26,7 @@ defmodule Pleroma.Mixfile do
           "docs/config.md",
           "docs/Pleroma-API.md",
           "docs/Admin-API.md",
+          "docs/Clients.md",
           "docs/Differences-in-MastodonAPI-Responses.md"
         ],
         main: "readme",
@@ -54,9 +55,8 @@ defmodule Pleroma.Mixfile do
   # Type `mix help deps` for examples and options.
   defp deps do
     [
-      # Until Phoenix 1.4.1 is released
-      {:phoenix, github: "phoenixframework/phoenix", branch: "v1.4"},
-      {:plug_cowboy, "~> 1.0"},
+      {:phoenix, "~> 1.4.1"},
+      {:plug_cowboy, "~> 2.0"},
       {:phoenix_pubsub, "~> 1.1"},
       {:phoenix_ecto, "~> 3.3"},
       {:postgrex, ">= 0.13.5"},
@@ -88,7 +88,11 @@ defmodule Pleroma.Mixfile do
       {:gen_smtp, "~> 0.13"},
       {:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test},
       {:floki, "~> 0.20.0"},
-      {:ex_syslogger, github: "slashmili/ex_syslogger", tag: "1.4.0"}
+      {:ex_syslogger, github: "slashmili/ex_syslogger", tag: "1.4.0"},
+      {:timex, "~> 3.5"},
+      {:auto_linker,
+       git: "https://git.pleroma.social/pleroma/auto_linker.git",
+       ref: "94193ca5f97c1f9fdf3d1469653e2d46fac34bcd"}
     ]
   end