X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=mix.exs;h=31ebcc5f3cfb7b0f1ecfea0c2edcab2b37f60311;hb=00ddfbe1c2311ea23927d0692353ae6295c1640c;hp=5b56b94904dd8c1551a2bab4757f6f5c619e65a2;hpb=41e3401c5cb4f57291b324c1d3377660f7fc356e;p=akkoma

diff --git a/mix.exs b/mix.exs
index 5b56b9490..31ebcc5f3 100644
--- a/mix.exs
+++ b/mix.exs
@@ -43,16 +43,18 @@ defmodule Pleroma.Mixfile do
   # Type `mix help deps` for examples and options.
   defp deps do
     [
-      {:phoenix, "~> 1.3.3"},
-      {:phoenix_pubsub, "~> 1.0.2"},
+      # Until Phoenix 1.4.1 is released
+      {:phoenix, github: "phoenixframework/phoenix", branch: "v1.4"},
+      {:plug_cowboy, "~> 1.0"},
+      {:phoenix_pubsub, "~> 1.1"},
       {:phoenix_ecto, "~> 3.3"},
       {:postgrex, ">= 0.13.5"},
       {:gettext, "~> 0.15"},
-      {:cowboy, "~> 1.1.2", override: true},
       {:comeonin, "~> 4.1.1"},
       {:pbkdf2_elixir, "~> 0.12.3"},
       {:trailing_format_plug, "~> 0.0.7"},
       {:html_sanitize_ex, "~> 1.3.0"},
+      {:html_entities, "~> 0.4"},
       {:phoenix_html, "~> 2.10"},
       {:calendar, "~> 0.17.4"},
       {:cachex, "~> 3.0.2"},
@@ -72,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