X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=CHANGELOG.md;h=f303e22a7387b24b859625f541825da2de86e4ac;hb=7ad1732ed2444d4d7bb1a89e66d46e5d52536e0f;hp=07bc6d77c4446866ab11bd5846e2b3d35a8178a8;hpb=96de4bfbcacb963d85bd94781096e86bab3b7e0f;p=akkoma

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07bc6d77c..f303e22a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,10 +3,30 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## Unreleased
+
+### Changed
+
+- Settings renaming: `:await_up_timeout` in `:connections_pool` namespace to `connect_timeout`, `timeout` in `pools` namespace to `recv_timeout`.
+
+### Removed
+
+- **Breaking:** Removed `Pleroma.Workers.Cron.StatsWorker` setting from Oban `:crontab`.
+
 ## unreleased-patch - ???
 
+### Added
+
+- Rich media failure tracking (along with `:failure_backoff` option)
+
 ### Fixed
+
+- Possible OOM errors with the default HTTP adapter
 - Mastodon API: Search parameter `following` now correctly returns the followings rather than the followers
+- Mastodon API: Timelines hanging for (`number of posts with links * rich media timeout`) in the worst case.
+  Reduced to just rich media timeout.
+- Mastodon API: Cards being wrong for preview statuses due to cache key collision
+- Password resets no longer processed for deactivated accounts
 
 ## [2.1.0] - 2020-08-28