From 05cd0cc712c7cd47ba4b7c903e716c8b9406e4c6 Mon Sep 17 00:00:00 2001 From: Angelina Filippova Date: Wed, 9 Dec 2020 00:50:04 +0300 Subject: [PATCH] Remove :fed_sockets settings --- CHANGELOG.md | 1 + src/views/settings/components/Http.vue | 12 +----------- src/views/settings/components/tabs.js | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c21adff0..bd324b81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Move `:restrict_unauthenticated` settings from Authentication tab to Instance tab - Replace regular inputs with textareas for setting welcome messages in the Settings section - Update rendering Moderation Log Messages so that all usernames are links to the pages of the corresponding users in Admin-FE +- Remove Websocket based federation settings ### Fixed diff --git a/src/views/settings/components/Http.vue b/src/views/settings/components/Http.vue index 7b82537e..8aa8a23b 100644 --- a/src/views/settings/components/Http.vue +++ b/src/views/settings/components/Http.vue @@ -11,14 +11,10 @@ - + - - - -
Submit
@@ -44,12 +40,6 @@ export default { corsPlugData() { return _.get(this.settings.settings, [':cors_plug']) || {} }, - fedSockets() { - return this.settings.description.find(setting => setting.key === ':fed_sockets') - }, - fedSocketsData() { - return _.get(this.settings.settings, [':pleroma', ':fed_sockets']) || {} - }, http() { return this.settings.description.find(setting => setting.key === ':http') }, diff --git a/src/views/settings/components/tabs.js b/src/views/settings/components/tabs.js index 84907139..e3a98a3c 100644 --- a/src/views/settings/components/tabs.js +++ b/src/views/settings/components/tabs.js @@ -26,7 +26,7 @@ export const tabs = description => { }, 'http': { label: 'settings.http', - settings: [':cors_plug', ':http', ':fed_sockets', ':http_security', ':web_cache_ttl'] + settings: [':cors_plug', ':http', ':http_security', ':web_cache_ttl'] }, 'instance': { label: 'settings.instance',