diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-09-08 11:26:12 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-09-08 11:26:12 +0000 |
| commit | a08196ca680554315e088e9ea4191f292bbe2642 (patch) | |
| tree | e38dad4a9fd0d566859755aec6c40f4f3a62fd2d /CHANGELOG.md | |
| parent | 6a567a131ec04dbeb71012f2caeebf563ed453a4 (diff) | |
| parent | d34dc4a7469b97e28ca4fffc8b2387c937ab56d8 (diff) | |
| download | pleroma-fix/disable-favicons-in-tests.tar.gz | |
Merge branch 'develop' into 'fix/disable-favicons-in-tests'fix/disable-favicons-in-tests
# Conflicts:
# config/test.exs
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 46f1e859b..e6180a6da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ## Unreleased +### Changed + +- Renamed `:await_up_timeout` in `:connections_pool` namespace to `:connect_timeout`, old name is deprecated. +- Renamed `:timeout` in `pools` namespace to `:recv_timeout`, old name is deprecated. + ### Removed - **Breaking:** Removed `Pleroma.Workers.Cron.StatsWorker` setting from Oban `:crontab`. - ## unreleased-patch - ??? ### Added @@ -25,7 +29,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - 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 ### Changed |