From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Sun, 6 Oct 2019 06:30:49 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth... 
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=f459aabdfafa990b33610438650f882ccac072d2;p=akkoma

Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions

# Conflicts:
#	CHANGELOG.md
---

f459aabdfafa990b33610438650f882ccac072d2
diff --cc CHANGELOG.md
index 4ae1079fe,db505591b..b7178889f
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -10,6 -11,8 +11,9 @@@ The format is based on [Keep a Changelo
  - Mastodon API: Account entities now include `follow_requests_count` (planned Mastodon 3.x addition)
  - Pleroma API: `GET /api/v1/pleroma/accounts/:id/scrobbles` to get a list of recently scrobbled items
  - Pleroma API: `POST /api/v1/pleroma/scrobble` to scrobble a media item
+ - Mastodon API: Add `upload_limit`, `avatar_upload_limit`, `background_upload_limit`, and `banner_upload_limit` to `/api/v1/instance`
+ - Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
++- Authentication: Added rate limit for password-authorized actions / login existence checks
  
  ### Changed
  - **Breaking:** Elixir >=1.8 is now required (was >= 1.7)