diff options
author | Lain Soykaf <lain@lain.com> | 2025-03-01 17:45:28 +0400 |
---|---|---|
committer | Lain Soykaf <lain@lain.com> | 2025-03-01 17:45:28 +0400 |
commit | 32acdf0936847870657fb265e02c56c1273378e0 (patch) | |
tree | 6350d15a98b971d2c581c9d239d50617dd7be97a /config/config.exs | |
parent | a8e863e0d627b6ed9563d953ee2cc8c9f4c9ee7a (diff) | |
parent | 13a88bd1a5a13c771d33d327d54125c68bbb9cb3 (diff) | |
download | pleroma-32acdf0936847870657fb265e02c56c1273378e0.tar.gz pleroma-32acdf0936847870657fb265e02c56c1273378e0.zip |
Merge branch 'security-2.9' into release/2.9.0
Diffstat (limited to 'config/config.exs')
-rw-r--r-- | config/config.exs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index 27e2d4711..31783b488 100644 --- a/config/config.exs +++ b/config/config.exs @@ -150,7 +150,10 @@ config :mime, :types, %{ "application/xrd+xml" => ["xrd+xml"], "application/jrd+json" => ["jrd+json"], "application/activity+json" => ["activity+json"], - "application/ld+json" => ["activity+json"] + "application/ld+json" => ["activity+json"], + # Can be removed when bumping MIME past 2.0.5 + # see https://akkoma.dev/AkkomaGang/akkoma/issues/657 + "image/apng" => ["apng"] } config :tesla, adapter: Tesla.Adapter.Hackney @@ -359,7 +362,8 @@ config :pleroma, :activitypub, follow_handshake_timeout: 500, note_replies_output_limit: 5, sign_object_fetches: true, - authorized_fetch_mode: false + authorized_fetch_mode: false, + client_api_enabled: false config :pleroma, :streamer, workers: 3, |