Merge branch 'mastodon-websocket-fix' into 'develop'

Fix Mastodon WebSocket authentication See merge request pleroma/pleroma!4206
2024-11-13 08:22:44 +00:00 · 2024-11-13 08:22:44 +00:00 · 53c2d2cd87
commit 53c2d2cd87
parent f45f17b5ff
6 changed files with 26 additions and 3 deletions
--- 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"},