Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'

[akkoma] / mix.exs

diff --git a/mix.exs b/mix.exs
index 52974c841d21f10e6cc92117ef930abd24838dd8..99e30c2a2308900bdf2674bce8bd1927bdfafd5a 100644 (file)
--- a/mix.exs
+++ b/mix.exs
@@ -21,8 +21,9 @@ defmodule Pleroma.Mixfile do
       homepage_url: "https://pleroma.social/",
       docs: [
         logo: "priv/static/static/logo.png",
-        extras: ["README.md", "config/config.md"],
-        main: "readme"
+        extras: ["README.md", "docs/config.md", "docs/Pleroma-API.md"],
+        main: "readme",
+        output: "priv/static/doc"
       ]
     ]
   end
@@ -44,7 +45,7 @@ defmodule Pleroma.Mixfile do
   defp deps do
     [
       # Until Phoenix 1.4.1 is released
-      {:phoenix, github: "feld/phoenix", branch: "v1.4"},
+      {:phoenix, github: "phoenixframework/phoenix", branch: "v1.4"},
       {:plug_cowboy, "~> 1.0"},
       {:phoenix_pubsub, "~> 1.1"},
       {:phoenix_ecto, "~> 3.3"},
@@ -73,7 +74,8 @@ defmodule Pleroma.Mixfile do
       {:ex_doc, "> 0.18.3 and < 0.20.0", only: :dev, runtime: false},
       {:web_push_encryption, "~> 0.2.1"},
       {:swoosh, "~> 0.20"},
-      {:gen_smtp, "~> 0.13"}
+      {:gen_smtp, "~> 0.13"},
+      {:websocket_client, git: "https://github.com/jeremyong/websocket_client.git", only: :test}
     ]
   end