From: lain <lain@soykaf.club>
Date: Fri, 4 Oct 2019 12:52:11 +0000 (+0000)
Subject: Merge branch 'featrue/job-monitor' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=27110793a7d8e3aa6434bde63a1f687424ae779c;p=akkoma

Merge branch 'featrue/job-monitor' into 'develop'

Add Pleroma.JobQueueMonitor

Closes #1274

See merge request pleroma/pleroma!1721
---

27110793a7d8e3aa6434bde63a1f687424ae779c
diff --cc CHANGELOG.md
index f677611c9,0a88f9d75..6ebc46b7d
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@@ -6,11 -6,8 +6,12 @@@ The format is based on [Keep a Changelo
  ## [Unreleased]
  ### Added
  - Refreshing poll results for remote polls
+ - Job queue stats to the healthcheck page
  - Admin API: Add ability to require password reset
 +- 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`
  
  ### Changed
  - **Breaking:** Elixir >=1.8 is now required (was >= 1.7)