summaryrefslogtreecommitdiff
path: root/mix.exs
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2024-11-13 08:22:44 +0000
committerlain <lain@soykaf.club>2024-11-13 08:22:44 +0000
commitdcb0c47773c0bcb8162f9d6100e8a6a3a1ae36c7 (patch)
tree92cb53c4c4e19563ea3c945ff4bf08c87a66f140 /mix.exs
parent83b866b2573bbe5e10f56f1ea8b2a1b8e651d2ad (diff)
parent8c91fd8785c25e694d9341b17b5182041c575166 (diff)
downloadpleroma-dcb0c47773c0bcb8162f9d6100e8a6a3a1ae36c7.tar.gz
pleroma-dcb0c47773c0bcb8162f9d6100e8a6a3a1ae36c7.zip
Merge branch 'mastodon-websocket-fix' into 'develop'
Fix Mastodon WebSocket authentication See merge request pleroma/pleroma!4206
Diffstat (limited to 'mix.exs')
-rw-r--r--mix.exs3
1 files changed, 2 insertions, 1 deletions
diff --git a/mix.exs b/mix.exs
index 89ec5e831..f2b72ff05 100644
--- a/mix.exs
+++ b/mix.exs
@@ -132,7 +132,8 @@ defmodule Pleroma.Mixfile do
# Type `mix help deps` for examples and options.
defp deps do
[
- {:phoenix, "~> 1.7.3"},
+ {:phoenix,
+ git: "https://github.com/feld/phoenix", branch: "v1.7.14-websocket-headers", override: true},
{:phoenix_ecto, "~> 4.4"},
{:ecto_sql, "~> 3.10"},
{:ecto_enum, "~> 1.4"},