Merge branch 'develop' into frontend-switcher-9000

[akkoma] / config / description.exs

diff --git a/config/description.exs b/config/description.exs
index 75fd23566b1f3728cf8f42462ce77f1188c65fe0..d329f8afa156e3548a34c85b2e205ac58f215603 100644 (file)
--- a/config/description.exs
+++ b/config/description.exs
@@ -969,6 +969,12 @@ config :pleroma, :config_description, [
         key: :export_prometheus_metrics,
         type: :boolean,
         description: "Enable prometheus metrics (at /api/v1/akkoma/metrics)"
+      },
+      %{
+        key: :federated_timeline_available,
+        type: :boolean,
+        description:
+          "Let people view the 'firehose' feed of all public statuses from all instances."
       }
     ]
   },
@@ -2993,6 +2999,11 @@ config :pleroma, :config_description, [
             key: :federated,
             type: :boolean,
             description: "Disallow viewing the whole known network timeline."
+          },
+          %{
+            key: :bubble,
+            type: :boolean,
+            description: "Disallow viewing the bubble timeline."
           }
         ]
       },