diff options
author | lain <lain@soykaf.club> | 2025-03-01 16:41:38 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2025-03-01 16:41:38 +0000 |
commit | af6d5470d29f294e9b356da36cccbcaf85379f78 (patch) | |
tree | 81eb0ba210f674eb0f6f41cde9b692a27ea96ca0 /config/description.exs | |
parent | fe3e61f6ece0335627f675e04a93917e6c613c6c (diff) | |
parent | cd5f018206c991628ff1530095bb71cf941e7a8b (diff) | |
download | pleroma-af6d5470d29f294e9b356da36cccbcaf85379f78.tar.gz pleroma-af6d5470d29f294e9b356da36cccbcaf85379f78.zip |
Merge branch 'release/2.9.0' into 'stable'
Release/2.9.0
See merge request pleroma/pleroma!4331
Diffstat (limited to 'config/description.exs')
-rw-r--r-- | config/description.exs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/config/description.exs b/config/description.exs index 47f4771eb..f091e4924 100644 --- a/config/description.exs +++ b/config/description.exs @@ -1772,6 +1772,11 @@ config :pleroma, :config_description, [ type: :integer, description: "Following handshake timeout", suggestions: [500] + }, + %{ + key: :client_api_enabled, + type: :boolean, + description: "Allow client to server ActivityPub interactions" } ] }, @@ -3302,8 +3307,7 @@ config :pleroma, :config_description, [ suggestions: [ Pleroma.Web.Preload.Providers.Instance, Pleroma.Web.Preload.Providers.User, - Pleroma.Web.Preload.Providers.Timelines, - Pleroma.Web.Preload.Providers.StatusNet + Pleroma.Web.Preload.Providers.Timelines ] } ] |