From: Haelwenn Date: Tue, 15 Sep 2020 08:25:10 +0000 (+0000) Subject: Merge branch 'fix/mrf-simple-welcome-chats' into 'develop' X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=5c4ff5c73ce41f252e99a3c5c445efcecaa43dfe;p=akkoma 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 --- 5c4ff5c73ce41f252e99a3c5c445efcecaa43dfe diff --cc CHANGELOG.md index 88c489895,ac4a6f7f6..82f64d441 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@@ -15,11 -16,12 +16,14 @@@ The format is based on [Keep a Changelo - **Breaking:** `Pleroma.Workers.Cron.StatsWorker` setting from Oban `:crontab` (moved to a simpler implementation). - **Breaking:** `Pleroma.Workers.Cron.ClearOauthTokenWorker` setting from Oban `:crontab` (moved to scheduled jobs). - **Breaking:** `Pleroma.Workers.Cron.PurgeExpiredActivitiesWorker` setting from Oban `:crontab` (moved to scheduled jobs). +- 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