summaryrefslogtreecommitdiff
path: root/CHANGELOG.md
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-07-09 14:15:10 +0000
committerrinpatch <rinpatch@sdf.org>2019-07-09 14:15:10 +0000
commit376a55c97fcf178abec3091db830215642bf23c1 (patch)
treecd4c52fb36c8f89092b8bad38b3923b711bfc2b2 /CHANGELOG.md
parent8574ebfc120efc2121e3bd488b1e80ae78241328 (diff)
parentdd5a41e2a4312a3dc7a1083d3d0ac5b356afafa8 (diff)
downloadpleroma-376a55c97fcf178abec3091db830215642bf23c1.tar.gz
pleroma-376a55c97fcf178abec3091db830215642bf23c1.zip
Merge branch '161-incoming-replies-depth-limit' into 'develop'
[#161] Limited replies depth on incoming federation (memory leaks fix) Closes #161 See merge request pleroma/pleroma!1361
Diffstat (limited to 'CHANGELOG.md')
-rw-r--r--CHANGELOG.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84a16ff3c..63ab1a6e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [Unreleased]
### Added
- MRF: Support for priming the mediaproxy cache (`Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy`)
+Configuration: `federation_incoming_replies_max_depth` option
- Mastodon API: Support for the [`tagged` filter](https://github.com/tootsuite/mastodon/pull/9755) in [`GET /api/v1/accounts/:id/statuses`](https://docs.joinmastodon.org/api/rest/accounts/#get-api-v1-accounts-id-statuses)
- Admin API: Return users' tags when querying reports
- Admin API: Return avatar and display name when querying users