diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-09-03 17:12:15 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-09-03 17:12:15 +0300 |
| commit | eb17cc17a146471d3774fc2b972128dd75eb05af (patch) | |
| tree | 1f9d09a10d8e7a43041e4f9ab9c7e476f97dc55d /CHANGELOG.md | |
| parent | b49085c156a6a4449c95c2c315f6250317122735 (diff) | |
| parent | 46ffd8b3b6359ec796733a8fff5bdb7d03a728d5 (diff) | |
| download | pleroma-eb17cc17a146471d3774fc2b972128dd75eb05af.tar.gz pleroma-eb17cc17a146471d3774fc2b972128dd75eb05af.zip | |
[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'CHANGELOG.md')
| -rw-r--r-- | CHANGELOG.md | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c9d6fef17..cedacbdf6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,7 +19,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Mastodon API: Unsubscribe followers when they unfollow a user - AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses) - Improve digest email template -- Replaced [pleroma_job_queue](https://git.pleroma.social/pleroma/pleroma_job_queue) and `Pleroma.Web.Federator.RetryQueue` with [Oban](https://github.com/sorentwo/oban) (see [`docs/config.md`](docs/config.md) on migrating customized worker / retry settings). +– Pagination: (optional) return `total` alongside with `items` when paginating +- Replaced [pleroma_job_queue](https://git.pleroma.social/pleroma/pleroma_job_queue) and `Pleroma.Web.Federator.RetryQueue` with [Oban](https://github.com/sorentwo/oban) (see [`docs/config.md`](docs/config.md) on migrating customized worker / retry settings) - Introduced [quantum](https://github.com/quantum-elixir/quantum-core) job scheduler ### Fixed |