aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkaniini <ariadne@dereferenced.org>2019-07-31 20:08:27 +0000
committerkaniini <ariadne@dereferenced.org>2019-07-31 20:08:27 +0000
commitcdfd02e90455fe7c01026efb48af3194cc82252b (patch)
tree64b74419a43be028069e8c0a5ec7a1635e194233
parent6c06529cd4549fca3ba4b1de72838240463f8306 (diff)
parentdef0c49ead94d21a63bdc7323521b6d73ad4c0b2 (diff)
downloadpleroma-cdfd02e90455fe7c01026efb48af3194cc82252b.tar.gz
Merge branch 'chore/changelog-update' into 'develop'
Add a changelog entry for disallowing locked accounts follows over OStatus See merge request pleroma/pleroma!1513
-rw-r--r--CHANGELOG.md1
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b02ed243b..bd64b2259 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
## [Unreleased]
### Security
- OStatus: eliminate the possibility of a protocol downgrade attack.
+- OStatus: prevent following locked accounts, bypassing the approval process.
### Changed
- **Breaking:** Configuration: A setting to explicitly disable the mailer was added, defaulting to true, if you are using a mailer add `config :pleroma, Pleroma.Emails.Mailer, enabled: true` to your config