Merge branch 'chores/2.4.0-develop' into 'develop'

Mergeback: 2.4.0 See merge request pleroma/pleroma!3494
2021-08-08 14:40:51 +00:00 · 2021-08-08 14:40:51 +00:00 · c45b3bde94
commit c45b3bde94
parent 5f5dc24027 8f730f70cb
241 changed files with 277 additions and 14 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -8,6 +8,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Changed
 ### Added
 ### Fixed
 ### Removed
 ## 2.4.0 - 2021-08-xx
 ### Changed
 - **Breaking:** Configuration: `:chat, enabled` moved to `:shout, enabled` and `:instance, chat_limit` moved to `:shout, limit`
 - Support for Erlang/OTP 24
 - The `application` metadata returned with statuses is no longer hardcoded. Apps that want to display these details will now have valid data for new posts after this change.
@ -34,14 +44,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Mix task `pleroma.database prune_objects`
 - Fixed rendering of JSON errors on ActivityPub endpoints.
 - Linkify: Parsing crash with URLs ending in unbalanced closed paren, no path separator, and no query parameters
 ### Removed
 - **Breaking**: Remove deprecated `/api/qvitter/statuses/notifications/read` (replaced by `/api/v1/pleroma/notifications/read`)
 ## Unreleased (Patch)
 ### Fixed
 - Try to save exported ConfigDB settings (migrate_from_db) in the system temp directory if default location is not writable.
 - Uploading custom instance thumbnail via AdminAPI/AdminFE generated invalid URL to the image
 - Applying ConcurrentLimiter settings via AdminAPI
@ -50,7 +52,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - MRF (`SimplePolicy`): Embedded objects are now checked. If any embedded object would be rejected, its parent is rejected. This fixes Announces leaking posts from blocked domains.
 - Fixed some Markdown issues, including trailing slash in links.
-## [2.3.0] - 2020-03-01
+### Removed
 - **Breaking**: Remove deprecated `/api/qvitter/statuses/notifications/read` (replaced by `/api/v1/pleroma/notifications/read`)
 ## [2.3.0] - 2021-03-01
 ### Security
@ -151,7 +156,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
  - Mastodon API: Support for expires_in/expires_at in the Filters.
 </details>
-## [2.2.2] - 2020-01-18
+## [2.2.2] - 2021-01-18
 ### Fixed
--- a/mix.exs
+++ b/mix.exs
@ -4,7 +4,7 @@ defmodule Pleroma.Mixfile do
  def project do
    [
      app: :pleroma,
-      version: version("2.3.50"),
+      version: version("2.4.50"),
      elixir: "~> 1.9",
      elixirc_paths: elixirc_paths(Mix.env()),
      compilers: [:phoenix, :gettext] ++ Mix.compilers(),
--- a/priv/static/adminfe/app.143a1409.css
+++ b/priv/static/adminfe/app.143a1409.css
--- a/priv/static/adminfe/app.6fb984d1.css
+++ b/priv/static/adminfe/app.6fb984d1.css
--- a/priv/static/adminfe/chunk-03c5.9aae1f65.css
+++ b/priv/static/adminfe/chunk-03c5.9aae1f65.css
--- a/priv/static/adminfe/chunk-0537.76929cff.css
+++ b/priv/static/adminfe/chunk-0537.76929cff.css
--- a/priv/static/adminfe/chunk-0c60.487f66a2.css
+++ b/priv/static/adminfe/chunk-0c60.487f66a2.css
--- a/priv/static/adminfe/chunk-1719.17e585a5.css
+++ b/priv/static/adminfe/chunk-1719.17e585a5.css
--- a/priv/static/adminfe/chunk-176e.fd32d133.css
+++ b/priv/static/adminfe/chunk-176e.fd32d133.css
--- a/priv/static/adminfe/chunk-1e1e.5980e665.css
+++ b/priv/static/adminfe/chunk-1e1e.5980e665.css
--- a/priv/static/adminfe/chunk-2658.8ab9ac8a.css
+++ b/priv/static/adminfe/chunk-2658.8ab9ac8a.css
--- a/priv/static/adminfe/chunk-2de0.0a7ddf1e.css
+++ b/priv/static/adminfe/chunk-2de0.0a7ddf1e.css
--- a/priv/static/adminfe/chunk-4403.bac94db6.css
+++ b/priv/static/adminfe/chunk-4403.bac94db6.css
--- a/priv/static/adminfe/chunk-45ed.3bf8b200.css
+++ b/priv/static/adminfe/chunk-45ed.3bf8b200.css
--- a/priv/static/adminfe/chunk-4770.20caaae1.css
+++ b/priv/static/adminfe/chunk-4770.20caaae1.css
--- a/priv/static/adminfe/chunk-4a1e.4b10c06f.css
+++ b/priv/static/adminfe/chunk-4a1e.4b10c06f.css
--- a/priv/static/adminfe/chunk-4d80.3e815d08.css
+++ b/priv/static/adminfe/chunk-4d80.3e815d08.css
--- a/priv/static/adminfe/chunk-5243.9b37b395.css
+++ b/priv/static/adminfe/chunk-5243.9b37b395.css
--- a/priv/static/adminfe/chunk-5ff8.4ccacc86.css
+++ b/priv/static/adminfe/chunk-5ff8.4ccacc86.css
--- a/priv/static/adminfe/chunk-68ea9.892994aa.css
+++ b/priv/static/adminfe/chunk-68ea9.892994aa.css
--- a/priv/static/adminfe/chunk-6e81.687d5046.css
+++ b/priv/static/adminfe/chunk-6e81.687d5046.css
--- a/priv/static/adminfe/chunk-71b5.a479f25b.css
+++ b/priv/static/adminfe/chunk-71b5.a479f25b.css
--- a/priv/static/adminfe/chunk-a104.e69888e1.css
+++ b/priv/static/adminfe/chunk-a104.e69888e1.css
--- a/priv/static/adminfe/chunk-bc60.adb8a162.css
+++ b/priv/static/adminfe/chunk-bc60.adb8a162.css
--- a/priv/static/adminfe/chunk-commons.c9de7e30.css
+++ b/priv/static/adminfe/chunk-commons.c9de7e30.css
--- a/priv/static/adminfe/chunk-elementUI.f1f2be85.css
+++ b/priv/static/adminfe/chunk-elementUI.f1f2be85.css
--- a/priv/static/adminfe/chunk-f1f7.c3b9c13f.css
+++ b/priv/static/adminfe/chunk-f1f7.c3b9c13f.css
--- a/priv/static/adminfe/chunk-libs.74976a6a.css
+++ b/priv/static/adminfe/chunk-libs.74976a6a.css
--- a/priv/static/adminfe/index.html
+++ b/priv/static/adminfe/index.html
@ -1 +1 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>Admin FE</title><link rel="shortcut icon" href=favicon.ico><link href=chunk-elementUI.f77689d7.css rel=stylesheet><link href=chunk-libs.5cf7f50a.css rel=stylesheet><link href=app.6fb984d1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/runtime.6b30c658.js></script><script type=text/javascript src=static/js/chunk-elementUI.21957ec8.js></script><script type=text/javascript src=static/js/chunk-libs.5ca2c8e8.js></script><script type=text/javascript src=static/js/app.1428845f.js></script></body></html>
+<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>Admin FE</title><link rel="shortcut icon" href=favicon.ico><link href=chunk-elementUI.f1f2be85.css rel=stylesheet><link href=chunk-libs.74976a6a.css rel=stylesheet><link href=app.143a1409.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/runtime.2a586239.js></script><script type=text/javascript src=static/js/chunk-elementUI.4c32a355.js></script><script type=text/javascript src=static/js/chunk-libs.55b24a78.js></script><script type=text/javascript src=static/js/app.f02f5ebc.js></script></body></html>
--- a/priv/static/adminfe/static/img/401.089007e.gif
+++ b/priv/static/adminfe/static/img/401.089007e.gif
--- a/priv/static/adminfe/static/img/404.a57b6f3.png
+++ b/priv/static/adminfe/static/img/404.a57b6f3.png
--- a/priv/static/adminfe/static/js/app.1428845f.js
+++ b/priv/static/adminfe/static/js/app.1428845f.js
--- a/priv/static/adminfe/static/js/app.1428845f.js.map
+++ b/priv/static/adminfe/static/js/app.1428845f.js.map
--- a/priv/static/adminfe/static/js/app.f02f5ebc.js
+++ b/priv/static/adminfe/static/js/app.f02f5ebc.js
--- a/priv/static/adminfe/static/js/app.f02f5ebc.js.map
+++ b/priv/static/adminfe/static/js/app.f02f5ebc.js.map
--- a/priv/static/adminfe/static/js/chunk-03c5.7f893db6.js
+++ b/priv/static/adminfe/static/js/chunk-03c5.7f893db6.js
--- a/priv/static/adminfe/static/js/chunk-03c5.7f893db6.js.map
+++ b/priv/static/adminfe/static/js/chunk-03c5.7f893db6.js.map
--- a/priv/static/adminfe/static/js/chunk-0537.d0eef370.js
+++ b/priv/static/adminfe/static/js/chunk-0537.d0eef370.js
--- a/priv/static/adminfe/static/js/chunk-0537.d0eef370.js.map
+++ b/priv/static/adminfe/static/js/chunk-0537.d0eef370.js.map
--- a/priv/static/adminfe/static/js/chunk-0c60.9b12ac3f.js
+++ b/priv/static/adminfe/static/js/chunk-0c60.9b12ac3f.js
--- a/priv/static/adminfe/static/js/chunk-0c60.9b12ac3f.js.map
+++ b/priv/static/adminfe/static/js/chunk-0c60.9b12ac3f.js.map
--- a/priv/static/adminfe/static/js/chunk-170f.e1d6aac3.js
+++ b/priv/static/adminfe/static/js/chunk-170f.e1d6aac3.js
--- a/priv/static/adminfe/static/js/chunk-170f.e1d6aac3.js.map
+++ b/priv/static/adminfe/static/js/chunk-170f.e1d6aac3.js.map
--- a/priv/static/adminfe/static/js/chunk-1719.d152ff7e.js
+++ b/priv/static/adminfe/static/js/chunk-1719.d152ff7e.js
--- a/priv/static/adminfe/static/js/chunk-1719.d152ff7e.js.map
+++ b/priv/static/adminfe/static/js/chunk-1719.d152ff7e.js.map
--- a/priv/static/adminfe/static/js/chunk-176e.c2ac32bc.js
+++ b/priv/static/adminfe/static/js/chunk-176e.c2ac32bc.js
--- a/priv/static/adminfe/static/js/chunk-176e.c2ac32bc.js.map
+++ b/priv/static/adminfe/static/js/chunk-176e.c2ac32bc.js.map
--- a/priv/static/adminfe/static/js/chunk-176e.f64cb745.js.map
+++ b/priv/static/adminfe/static/js/chunk-176e.f64cb745.js.map
--- a/priv/static/adminfe/static/js/chunk-1e1e.37f6f555.js
+++ b/priv/static/adminfe/static/js/chunk-1e1e.37f6f555.js
--- a/priv/static/adminfe/static/js/chunk-1e1e.37f6f555.js.map
+++ b/priv/static/adminfe/static/js/chunk-1e1e.37f6f555.js.map
--- a/priv/static/adminfe/static/js/chunk-2658.832c58e6.js
+++ b/priv/static/adminfe/static/js/chunk-2658.832c58e6.js
--- a/priv/static/adminfe/static/js/chunk-2658.832c58e6.js.map
+++ b/priv/static/adminfe/static/js/chunk-2658.832c58e6.js.map
--- a/priv/static/adminfe/static/js/chunk-2de0.06ba9e2f.js
+++ b/priv/static/adminfe/static/js/chunk-2de0.06ba9e2f.js
--- a/priv/static/adminfe/static/js/chunk-2de0.06ba9e2f.js.map
+++ b/priv/static/adminfe/static/js/chunk-2de0.06ba9e2f.js.map
--- a/priv/static/adminfe/static/js/chunk-35b1.50c1449b.js
+++ b/priv/static/adminfe/static/js/chunk-35b1.50c1449b.js
--- a/priv/static/adminfe/static/js/chunk-35b1.50c1449b.js.map
+++ b/priv/static/adminfe/static/js/chunk-35b1.50c1449b.js.map
--- a/priv/static/adminfe/static/js/chunk-4403.528e3dd7.js
+++ b/priv/static/adminfe/static/js/chunk-4403.528e3dd7.js
--- a/priv/static/adminfe/static/js/chunk-4403.528e3dd7.js.map
+++ b/priv/static/adminfe/static/js/chunk-4403.528e3dd7.js.map
--- a/priv/static/adminfe/static/js/chunk-45ed.a89b5b8d.js
+++ b/priv/static/adminfe/static/js/chunk-45ed.a89b5b8d.js
--- a/priv/static/adminfe/static/js/chunk-45ed.a89b5b8d.js.map
+++ b/priv/static/adminfe/static/js/chunk-45ed.a89b5b8d.js.map
--- a/priv/static/adminfe/static/js/chunk-4770.1c1fff97.js
+++ b/priv/static/adminfe/static/js/chunk-4770.1c1fff97.js
--- a/priv/static/adminfe/static/js/chunk-4770.1c1fff97.js.map
+++ b/priv/static/adminfe/static/js/chunk-4770.1c1fff97.js.map
--- a/priv/static/adminfe/static/js/chunk-4a1e.0f4047c1.js
+++ b/priv/static/adminfe/static/js/chunk-4a1e.0f4047c1.js
--- a/priv/static/adminfe/static/js/chunk-4a1e.0f4047c1.js.map
+++ b/priv/static/adminfe/static/js/chunk-4a1e.0f4047c1.js.map
--- a/priv/static/adminfe/static/js/chunk-4d80.6911cb76.js
+++ b/priv/static/adminfe/static/js/chunk-4d80.6911cb76.js
--- a/priv/static/adminfe/static/js/chunk-4d80.6911cb76.js.map
+++ b/priv/static/adminfe/static/js/chunk-4d80.6911cb76.js.map
--- a/priv/static/adminfe/static/js/chunk-5243.aa83b96d.js
+++ b/priv/static/adminfe/static/js/chunk-5243.aa83b96d.js
--- a/priv/static/adminfe/static/js/chunk-5243.aa83b96d.js.map
+++ b/priv/static/adminfe/static/js/chunk-5243.aa83b96d.js.map
--- a/priv/static/adminfe/static/js/chunk-5497.34fbd46e.js
+++ b/priv/static/adminfe/static/js/chunk-5497.34fbd46e.js
--- a/priv/static/adminfe/static/js/chunk-5497.34fbd46e.js.map
+++ b/priv/static/adminfe/static/js/chunk-5497.34fbd46e.js.map
--- a/priv/static/adminfe/static/js/chunk-5ff8.a7482f14.js
+++ b/priv/static/adminfe/static/js/chunk-5ff8.a7482f14.js
--- a/priv/static/adminfe/static/js/chunk-5ff8.a7482f14.js.map
+++ b/priv/static/adminfe/static/js/chunk-5ff8.a7482f14.js.map
--- a/priv/static/adminfe/static/js/chunk-68ea9.5a11341a.js
+++ b/priv/static/adminfe/static/js/chunk-68ea9.5a11341a.js
--- a/priv/static/adminfe/static/js/chunk-68ea9.5a11341a.js.map
+++ b/priv/static/adminfe/static/js/chunk-68ea9.5a11341a.js.map
--- a/priv/static/adminfe/static/js/chunk-6e81.6c4f2ce1.js
+++ b/priv/static/adminfe/static/js/chunk-6e81.6c4f2ce1.js
--- a/priv/static/adminfe/static/js/chunk-6e81.6c4f2ce1.js.map
+++ b/priv/static/adminfe/static/js/chunk-6e81.6c4f2ce1.js.map
--- a/priv/static/adminfe/static/js/chunk-7041.390b2ec4.js
+++ b/priv/static/adminfe/static/js/chunk-7041.390b2ec4.js
--- a/priv/static/adminfe/static/js/chunk-7041.390b2ec4.js.map
+++ b/priv/static/adminfe/static/js/chunk-7041.390b2ec4.js.map
--- a/priv/static/adminfe/static/js/chunk-71b5.a60307b1.js
+++ b/priv/static/adminfe/static/js/chunk-71b5.a60307b1.js
--- a/priv/static/adminfe/static/js/chunk-71b5.a60307b1.js.map
+++ b/priv/static/adminfe/static/js/chunk-71b5.a60307b1.js.map
--- a/priv/static/adminfe/static/js/chunk-7968.88218960.js
+++ b/priv/static/adminfe/static/js/chunk-7968.88218960.js
--- a/priv/static/adminfe/static/js/chunk-7968.88218960.js.map
+++ b/priv/static/adminfe/static/js/chunk-7968.88218960.js.map
--- a/priv/static/adminfe/static/js/chunk-7c6b.34152862.js
+++ b/priv/static/adminfe/static/js/chunk-7c6b.34152862.js
--- a/priv/static/adminfe/static/js/chunk-7c6b.34152862.js.map
+++ b/priv/static/adminfe/static/js/chunk-7c6b.34152862.js.map
--- a/priv/static/adminfe/static/js/chunk-a104.07359dcd.js
+++ b/priv/static/adminfe/static/js/chunk-a104.07359dcd.js
--- a/priv/static/adminfe/static/js/chunk-a104.07359dcd.js.map
+++ b/priv/static/adminfe/static/js/chunk-a104.07359dcd.js.map
--- a/priv/static/adminfe/static/js/chunk-bc60.4dbf525d.js
+++ b/priv/static/adminfe/static/js/chunk-bc60.4dbf525d.js
--- a/priv/static/adminfe/static/js/chunk-bc60.4dbf525d.js.map
+++ b/priv/static/adminfe/static/js/chunk-bc60.4dbf525d.js.map
--- a/priv/static/adminfe/static/js/chunk-commons.7f561ac1.js
+++ b/priv/static/adminfe/static/js/chunk-commons.7f561ac1.js
--- a/priv/static/adminfe/static/js/chunk-commons.7f561ac1.js.map
+++ b/priv/static/adminfe/static/js/chunk-commons.7f561ac1.js.map
--- a/priv/static/adminfe/static/js/chunk-d55e.f9bab96d.js.map
+++ b/priv/static/adminfe/static/js/chunk-d55e.f9bab96d.js.map
--- a/priv/static/adminfe/static/js/chunk-e660.2101cafc.js
+++ b/priv/static/adminfe/static/js/chunk-e660.2101cafc.js
--- a/priv/static/adminfe/static/js/chunk-e660.2101cafc.js.map
+++ b/priv/static/adminfe/static/js/chunk-e660.2101cafc.js.map
--- a/priv/static/adminfe/static/js/chunk-elementUI.4c32a355.js
+++ b/priv/static/adminfe/static/js/chunk-elementUI.4c32a355.js
--- a/priv/static/adminfe/static/js/chunk-elementUI.4c32a355.js.map
+++ b/priv/static/adminfe/static/js/chunk-elementUI.4c32a355.js.map
--- a/priv/static/adminfe/static/js/chunk-f1f7.80ae76f2.js
+++ b/priv/static/adminfe/static/js/chunk-f1f7.80ae76f2.js
--- a/priv/static/adminfe/static/js/chunk-f1f7.80ae76f2.js.map
+++ b/priv/static/adminfe/static/js/chunk-f1f7.80ae76f2.js.map
--- a/priv/static/adminfe/static/js/chunk-f364.a5927f18.js
+++ b/priv/static/adminfe/static/js/chunk-f364.a5927f18.js
--- a/priv/static/adminfe/static/js/chunk-f364.a5927f18.js.map
+++ b/priv/static/adminfe/static/js/chunk-f364.a5927f18.js.map
--- a/priv/static/adminfe/static/js/chunk-libs.55b24a78.js
+++ b/priv/static/adminfe/static/js/chunk-libs.55b24a78.js
--- a/Show more
+++ b/Show more
		`@ -1 +1 @@`
			<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>Admin FE</title><link rel="shortcut icon" href=favicon.ico><link href=chunk-elementUI.f77689d7.css rel=stylesheet><link href=chunk-libs.5cf7f50a.css rel=stylesheet><link href=app.6fb984d1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/runtime.6b30c658.js></script><script type=text/javascript src=static/js/chunk-elementUI.21957ec8.js></script><script type=text/javascript src=static/js/chunk-libs.5ca2c8e8.js></script><script type=text/javascript src=static/js/app.1428845f.js></script></body></html>				<!DOCTYPE html><html><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge,chrome=1"><meta name=renderer content=webkit><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><title>Admin FE</title><link rel="shortcut icon" href=favicon.ico><link href=chunk-elementUI.f1f2be85.css rel=stylesheet><link href=chunk-libs.74976a6a.css rel=stylesheet><link href=app.143a1409.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=static/js/runtime.2a586239.js></script><script type=text/javascript src=static/js/chunk-elementUI.4c32a355.js></script><script type=text/javascript src=static/js/chunk-libs.55b24a78.js></script><script type=text/javascript src=static/js/app.f02f5ebc.js></script></body></html>