diff options
| author | feld <feld@feld.me> | 2020-11-17 14:58:33 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-11-17 14:58:33 +0000 |
| commit | d33b9e7b335edc3d719063972ab8b3f650971a21 (patch) | |
| tree | 129e241cd2f04a702a89a43f757e8a47132e7e0e /config | |
| parent | cf99b1c1fd89553f072cc5a466aaebbe59d3e618 (diff) | |
| parent | 2c55f7d7cb25b857265df67c21bc59f7778653ee (diff) | |
| download | pleroma-d33b9e7b335edc3d719063972ab8b3f650971a21.tar.gz pleroma-d33b9e7b335edc3d719063972ab8b3f650971a21.zip | |
Merge branch 'remove/fedsockets' into 'develop'
Remove FedSockets
See merge request pleroma/pleroma!3155
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 1 | ||||
| -rw-r--r-- | config/description.exs | 13 |
2 files changed, 0 insertions, 14 deletions
diff --git a/config/config.exs b/config/config.exs index 0b8a75aad..1ac140ed0 100644 --- a/config/config.exs +++ b/config/config.exs @@ -129,7 +129,6 @@ config :pleroma, Pleroma.Web.Endpoint, dispatch: [ {:_, [ - {"/api/fedsocket/v1", Pleroma.Web.FedSockets.IncomingHandler, []}, {"/api/v1/streaming", Pleroma.Web.MastodonAPI.WebsocketHandler, []}, {"/websocket", Phoenix.Endpoint.CowboyWebSocket, {Phoenix.Transports.WebSocket, diff --git a/config/description.exs b/config/description.exs index 0552b37e0..a663d8127 100644 --- a/config/description.exs +++ b/config/description.exs @@ -274,19 +274,6 @@ config :pleroma, :config_description, [ }, %{ group: :pleroma, - key: :fed_sockets, - type: :group, - description: "Websocket based federation", - children: [ - %{ - key: :enabled, - type: :boolean, - description: "Enable FedSockets" - } - ] - }, - %{ - group: :pleroma, key: Pleroma.Emails.Mailer, type: :group, description: "Mailer-related settings", |