From: rinpatch <rinpatch@sdf.org>
Date: Thu, 17 Sep 2020 19:19:49 +0000 (+0300)
Subject: Merge branch 'stable' into stable-sync/2.1.2
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=065a4dddfdeb9a1b56318b6f0de1986e95a20734;p=akkoma

Merge branch 'stable' into stable-sync/2.1.2
---

065a4dddfdeb9a1b56318b6f0de1986e95a20734
diff --cc CHANGELOG.md
index de11dd7a9,2f85cc302..1266d2dfe
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -3,24 -3,11 +3,28 @@@ All notable changes to this project wil
  
  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.
 +- The `discoverable` field in the `User` struct will now add a NOINDEX metatag to profile pages when false.
 +- Users with the `discoverable` field set to false will not show up in searches.
 +- Minimum lifetime for ephmeral activities changed to 10 minutes and made configurable (`:min_lifetime` option).
 +### Removed
 +
 +- **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.
 +
- ## unreleased-patch - ???
+ ## [2.1.2] - 2020-09-17
+ 
+ ### Security
+ 
+ - Fix most MRF rules either crashing or not being applied to objects passed into the Common Pipeline (ChatMessage, Question, Answer, Audio, Event).
  
  ### Fixed