diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-09-15 08:25:10 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2020-09-15 08:25:10 +0000 |
| commit | 5c4ff5c73ce41f252e99a3c5c445efcecaa43dfe (patch) | |
| tree | 92f0c2dc990f8beb5040a2f280d056d690e952ea /CHANGELOG.md | |
| parent | 39d769f25057dbaf89dc23d39941780bc65c2b06 (diff) | |
| parent | 0b66e806e32055b625560eb06b9300cc856f9789 (diff) | |
| download | pleroma-5c4ff5c73ce41f252e99a3c5c445efcecaa43dfe.tar.gz pleroma-5c4ff5c73ce41f252e99a3c5c445efcecaa43dfe.zip | |
Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
Ensure we only apply media_nsfw simple policy on parsable objects
Closes #2133
See merge request pleroma/pleroma!2992
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 88c489895..82f64d441 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - 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. +- Minimum lifetime for ephmeral activities changed to 10 minutes and made configurable (`:min_lifetime` option). ### Removed @@ -18,8 +19,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Removed `:managed_config` option. In practice, it was accidentally removed with 2.0.0 release when frontends were switched to a new configuration mechanism, however it was not officially removed until now. -### Changed -- Minimum lifetime for ephmeral activities changed to 10 minutes and made configurable (`:min_lifetime` option). +## unreleased-patch - ??? + +### Fixed + +- Welcome Chat messages preventing user registration with MRF Simple Policy applied to the local instance ## [2.1.1] - 2020-09-08 |