Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

[akkoma] / config / description.exs

diff --git a/config/description.exs b/config/description.exs
index 2191e8d6dd488f0476a70d1435c7f06df1a6431e..eac97ad64c5a864d93bce5e40db65cc27b73c01e 100644 (file)
--- a/config/description.exs
+++ b/config/description.exs
@@ -1669,15 +1669,6 @@ config :pleroma, :config_description, [
       }
     ]
   },
-  %{
-    group: :pleroma,
-    key: :mrf_force_bot_unlisted,
-    tab: :mrf,
-    related_policy: "Pleroma.Web.ActivityPub.MRF.ForceBotUnlistedPolicy",
-    label: "MRF Force Bot Unlisted Policy",
-    type: :boolean,
-    description: "Makes bot posts to disappear from public timelines"
-  },
   %{
     group: :pleroma,
     key: :mrf_subchain,
@@ -3386,7 +3377,7 @@ config :pleroma, :config_description, [
         suggestions: [250]
       },
       %{
-        key: :await_up_timeout,
+        key: :connect_timeout,
         type: :integer,
         description: "Timeout while `gun` will wait until connection is up. Default: 5000ms.",
         suggestions: [5000]
@@ -3424,6 +3415,12 @@ config :pleroma, :config_description, [
               description:
                 "Maximum number of requests waiting for other requests to finish. After this number is reached, the pool will start returning errrors when a new request is made",
               suggestions: [10]
+            },
+            %{
+              key: :recv_timeout,
+              type: :integer,
+              description: "Timeout for the pool while gun will wait for response",
+              suggestions: [10_000]
             }
           ]
         }