Merge branch 'mergeback' into 'develop'

Merge stable back into develop Closes #2753 See merge request pleroma/pleroma!3602
2022-01-14 22:15:10 +00:00 · 2022-01-14 22:15:10 +00:00 · 8b5a658991
parent 84dcb55b0f a4436bcc3f
commit 8b5a658991
109 changed files with 12 additions and 2 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -42,6 +42,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Removed
 ## 2.4.2 - 2022-01-10
 ### Fixed
 - Federation issues caused by HTTP pool checkout timeouts
 - Compatibility with Elixir 1.13
 ### Upgrade notes
 1. Restart Pleroma
 ## 2.4.1 - 2021-08-29
 ### Changed
--- a/priv/static/index.html
+++ b/priv/static/index.html
@ -1 +1 @@
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link href=/static/css/app.9a4c5ede37b2f0230836.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><script type=text/javascript src=/static/js/vendors~app.fb9ee54b02db0c974e51.js></script><script type=text/javascript src=/static/js/app.ce97bd1883ee9dd7b809.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link href=/static/css/app.7d2d223f75c3a14b0991.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><script type=text/javascript src=/static/js/vendors~app.cea10ab53f3aa19fc30e.js></script><script type=text/javascript src=/static/js/app.6c972d84b60f601b01f8.js></script></body></html>
--- a/priv/static/static/css/app.7d2d223f75c3a14b0991.css
+++ b/priv/static/static/css/app.7d2d223f75c3a14b0991.css
--- a/priv/static/static/css/app.7d2d223f75c3a14b0991.css.map
+++ b/priv/static/static/css/app.7d2d223f75c3a14b0991.css.map
--- a/priv/static/static/css/app.9a4c5ede37b2f0230836.css.map
+++ b/priv/static/static/css/app.9a4c5ede37b2f0230836.css.map
--- a/priv/static/static/js/10.02ffbc25214f297f720f.js
+++ b/priv/static/static/js/10.02ffbc25214f297f720f.js
--- a/priv/static/static/js/10.02ffbc25214f297f720f.js.map
+++ b/priv/static/static/js/10.02ffbc25214f297f720f.js.map
--- a/priv/static/static/js/10.fdbf093cc5602ca4f2e1.js
+++ b/priv/static/static/js/10.fdbf093cc5602ca4f2e1.js
--- a/priv/static/static/js/11.c173c6036fb3af5581b3.js
+++ b/priv/static/static/js/11.c173c6036fb3af5581b3.js
--- a/priv/static/static/js/11.c173c6036fb3af5581b3.js.map
+++ b/priv/static/static/js/11.c173c6036fb3af5581b3.js.map
--- a/priv/static/static/js/12.5ca41e245bb40263bc7f.js
+++ b/priv/static/static/js/12.5ca41e245bb40263bc7f.js
--- a/priv/static/static/js/12.5ca41e245bb40263bc7f.js.map
+++ b/priv/static/static/js/12.5ca41e245bb40263bc7f.js.map
--- a/priv/static/static/js/12.a3dc3473565ec07a88c2.js
+++ b/priv/static/static/js/12.a3dc3473565ec07a88c2.js
--- a/priv/static/static/js/13.99621e6c47936075b44d.js
+++ b/priv/static/static/js/13.99621e6c47936075b44d.js
--- a/priv/static/static/js/13.99621e6c47936075b44d.js.map
+++ b/priv/static/static/js/13.99621e6c47936075b44d.js.map
--- a/priv/static/static/js/14.4e05e7c284119777ecc5.js
+++ b/priv/static/static/js/14.4e05e7c284119777ecc5.js
--- a/priv/static/static/js/14.4e05e7c284119777ecc5.js.map
+++ b/priv/static/static/js/14.4e05e7c284119777ecc5.js.map
--- a/priv/static/static/js/14.a2b9acaf9caa95d1fd7f.js
+++ b/priv/static/static/js/14.a2b9acaf9caa95d1fd7f.js
--- a/priv/static/static/js/14.a2b9acaf9caa95d1fd7f.js.map
+++ b/priv/static/static/js/14.a2b9acaf9caa95d1fd7f.js.map
--- a/priv/static/static/js/15.23f179cc3adc903bb537.js
+++ b/priv/static/static/js/15.23f179cc3adc903bb537.js
--- a/priv/static/static/js/15.23f179cc3adc903bb537.js.map
+++ b/priv/static/static/js/15.23f179cc3adc903bb537.js.map
--- a/priv/static/static/js/15.fe4e76f27cc478289a42.js.map
+++ b/priv/static/static/js/15.fe4e76f27cc478289a42.js.map
--- a/priv/static/static/js/16.43dd2c64dcb160dd96a6.js
+++ b/priv/static/static/js/16.43dd2c64dcb160dd96a6.js
--- a/priv/static/static/js/16.43dd2c64dcb160dd96a6.js.map
+++ b/priv/static/static/js/16.43dd2c64dcb160dd96a6.js.map
--- a/priv/static/static/js/16.90b5ee380da41d6d061c.js.map
+++ b/priv/static/static/js/16.90b5ee380da41d6d061c.js.map
--- a/priv/static/static/js/17.c5a6513076aa9c5a9564.js.map
+++ b/priv/static/static/js/17.c5a6513076aa9c5a9564.js.map
--- a/priv/static/static/js/17.d1deeeb81b7cab98b068.js
+++ b/priv/static/static/js/17.d1deeeb81b7cab98b068.js
--- a/priv/static/static/js/17.d1deeeb81b7cab98b068.js.map
+++ b/priv/static/static/js/17.d1deeeb81b7cab98b068.js.map
--- a/priv/static/static/js/18.a4d5b399e228a6a45a7b.js
+++ b/priv/static/static/js/18.a4d5b399e228a6a45a7b.js
--- a/priv/static/static/js/18.a4d5b399e228a6a45a7b.js.map
+++ b/priv/static/static/js/18.a4d5b399e228a6a45a7b.js.map
--- a/priv/static/static/js/18.ffde79cfe78615dbb020.js
+++ b/priv/static/static/js/18.ffde79cfe78615dbb020.js
--- a/priv/static/static/js/18.ffde79cfe78615dbb020.js.map
+++ b/priv/static/static/js/18.ffde79cfe78615dbb020.js.map
--- a/priv/static/static/js/19.c031807287d659bd841d.js.map
+++ b/priv/static/static/js/19.c031807287d659bd841d.js.map
--- a/priv/static/static/js/19.e513835c3274271258fa.js
+++ b/priv/static/static/js/19.e513835c3274271258fa.js
--- a/priv/static/static/js/19.e513835c3274271258fa.js.map
+++ b/priv/static/static/js/19.e513835c3274271258fa.js.map
--- a/priv/static/static/js/2.5f3ceb7bdf08fadacf00.js
+++ b/priv/static/static/js/2.5f3ceb7bdf08fadacf00.js
--- a/priv/static/static/js/2.5f3ceb7bdf08fadacf00.js.map
+++ b/priv/static/static/js/2.5f3ceb7bdf08fadacf00.js.map
--- a/priv/static/static/js/2.fec2056b00b4fa3921ba.js
+++ b/priv/static/static/js/2.fec2056b00b4fa3921ba.js
--- a/priv/static/static/js/2.fec2056b00b4fa3921ba.js.map
+++ b/priv/static/static/js/2.fec2056b00b4fa3921ba.js.map
--- a/priv/static/static/js/20.683b112f4dcea887f707.js
+++ b/priv/static/static/js/20.683b112f4dcea887f707.js
--- a/priv/static/static/js/20.683b112f4dcea887f707.js.map
+++ b/priv/static/static/js/20.683b112f4dcea887f707.js.map
--- a/priv/static/static/js/20.abb0d332055536a87c38.js.map
+++ b/priv/static/static/js/20.abb0d332055536a87c38.js.map
--- a/priv/static/static/js/21.6e952388ef8d5a0276dc.js.map
+++ b/priv/static/static/js/21.6e952388ef8d5a0276dc.js.map
--- a/priv/static/static/js/21.b2844ccdcfc3c8191e8e.js
+++ b/priv/static/static/js/21.b2844ccdcfc3c8191e8e.js
--- a/priv/static/static/js/21.b2844ccdcfc3c8191e8e.js.map
+++ b/priv/static/static/js/21.b2844ccdcfc3c8191e8e.js.map
--- a/priv/static/static/js/22.68c0a771d79e3383f5e8.js
+++ b/priv/static/static/js/22.68c0a771d79e3383f5e8.js
--- a/priv/static/static/js/22.68c0a771d79e3383f5e8.js.map
+++ b/priv/static/static/js/22.68c0a771d79e3383f5e8.js.map
--- a/priv/static/static/js/22.dbc79965f66b0bb62d88.js.map
+++ b/priv/static/static/js/22.dbc79965f66b0bb62d88.js.map
--- a/priv/static/static/js/23.0b6cdf4c9dc52c4291c0.js
+++ b/priv/static/static/js/23.0b6cdf4c9dc52c4291c0.js
--- a/priv/static/static/js/23.0b6cdf4c9dc52c4291c0.js.map
+++ b/priv/static/static/js/23.0b6cdf4c9dc52c4291c0.js.map
--- a/priv/static/static/js/23.4addb03e0862c780c55f.js.map
+++ b/priv/static/static/js/23.4addb03e0862c780c55f.js.map
--- a/priv/static/static/js/24.5cfb87799bd882b933dd.js
+++ b/priv/static/static/js/24.5cfb87799bd882b933dd.js
--- a/priv/static/static/js/24.5cfb87799bd882b933dd.js.map
+++ b/priv/static/static/js/24.5cfb87799bd882b933dd.js.map
--- a/priv/static/static/js/24.e4b623be1780a14a6168.js.map
+++ b/priv/static/static/js/24.e4b623be1780a14a6168.js.map
--- a/priv/static/static/js/25.34eeae0070f7f1eb6843.js
+++ b/priv/static/static/js/25.34eeae0070f7f1eb6843.js
--- a/priv/static/static/js/25.34eeae0070f7f1eb6843.js.map
+++ b/priv/static/static/js/25.34eeae0070f7f1eb6843.js.map
--- a/priv/static/static/js/25.8185e4d775cea9fe47e1.js
+++ b/priv/static/static/js/25.8185e4d775cea9fe47e1.js
--- a/priv/static/static/js/25.8185e4d775cea9fe47e1.js.map
+++ b/priv/static/static/js/25.8185e4d775cea9fe47e1.js.map
--- a/priv/static/static/js/26.34ec129dd8f860ce4a8e.js
+++ b/priv/static/static/js/26.34ec129dd8f860ce4a8e.js
--- a/priv/static/static/js/26.34ec129dd8f860ce4a8e.js.map
+++ b/priv/static/static/js/26.34ec129dd8f860ce4a8e.js.map
--- a/priv/static/static/js/26.bd86a0d958de2bb3905a.js.map
+++ b/priv/static/static/js/26.bd86a0d958de2bb3905a.js.map
--- a/priv/static/static/js/27.0f4a5145681cfb5a896e.js
+++ b/priv/static/static/js/27.0f4a5145681cfb5a896e.js
--- a/priv/static/static/js/27.0f4a5145681cfb5a896e.js.map
+++ b/priv/static/static/js/27.0f4a5145681cfb5a896e.js.map
--- a/priv/static/static/js/27.7d4ab8716762d6f57135.js.map
+++ b/priv/static/static/js/27.7d4ab8716762d6f57135.js.map
--- a/priv/static/static/js/28.75c01cd71372c39d5af8.js
+++ b/priv/static/static/js/28.75c01cd71372c39d5af8.js
--- a/priv/static/static/js/28.75c01cd71372c39d5af8.js.map
+++ b/priv/static/static/js/28.75c01cd71372c39d5af8.js.map
--- a/priv/static/static/js/28.a88999ebb3f7ec930aad.js.map
+++ b/priv/static/static/js/28.a88999ebb3f7ec930aad.js.map
--- a/priv/static/static/js/29.519f681d194c212ae75f.js.map
+++ b/priv/static/static/js/29.519f681d194c212ae75f.js.map
--- a/priv/static/static/js/29.b53cf1f3bcece005d78a.js
+++ b/priv/static/static/js/29.b53cf1f3bcece005d78a.js
--- a/priv/static/static/js/29.b53cf1f3bcece005d78a.js.map
+++ b/priv/static/static/js/29.b53cf1f3bcece005d78a.js.map
--- a/priv/static/static/js/3.bde677e65143f0cd1105.js
+++ b/priv/static/static/js/3.bde677e65143f0cd1105.js
--- a/priv/static/static/js/3.bde677e65143f0cd1105.js.map
+++ b/priv/static/static/js/3.bde677e65143f0cd1105.js.map
--- a/priv/static/static/js/30.064c236fa83ac21c252f.js
+++ b/priv/static/static/js/30.064c236fa83ac21c252f.js
--- a/priv/static/static/js/30.064c236fa83ac21c252f.js.map
+++ b/priv/static/static/js/30.064c236fa83ac21c252f.js.map
--- a/priv/static/static/js/30.d29cd76b0781bb654f87.js
+++ b/priv/static/static/js/30.d29cd76b0781bb654f87.js
--- a/priv/static/static/js/30.d29cd76b0781bb654f87.js.map
+++ b/priv/static/static/js/30.d29cd76b0781bb654f87.js.map
--- a/priv/static/static/js/31.15b545bb42e21d39c678.js
+++ b/priv/static/static/js/31.15b545bb42e21d39c678.js
--- a/priv/static/static/js/31.15b545bb42e21d39c678.js.map
+++ b/priv/static/static/js/31.15b545bb42e21d39c678.js.map
--- a/priv/static/static/js/31.226f7a848d733df38095.js
+++ b/priv/static/static/js/31.226f7a848d733df38095.js
--- a/priv/static/static/js/31.226f7a848d733df38095.js.map
+++ b/priv/static/static/js/31.226f7a848d733df38095.js.map
--- a/priv/static/static/js/32.19ca50edbb4d711838dc.js
+++ b/priv/static/static/js/32.19ca50edbb4d711838dc.js
--- a/priv/static/static/js/32.19ca50edbb4d711838dc.js.map
+++ b/priv/static/static/js/32.19ca50edbb4d711838dc.js.map
--- a/priv/static/static/js/32.899035ede0115c5c0f99.js
+++ b/priv/static/static/js/32.899035ede0115c5c0f99.js
--- a/priv/static/static/js/32.899035ede0115c5c0f99.js.map
+++ b/priv/static/static/js/32.899035ede0115c5c0f99.js.map
--- a/priv/static/static/js/4.7077bff64d63355b1635.js
+++ b/priv/static/static/js/4.7077bff64d63355b1635.js
--- a/priv/static/static/js/4.7077bff64d63355b1635.js.map
+++ b/priv/static/static/js/4.7077bff64d63355b1635.js.map
--- a/priv/static/static/js/5.cfb722ac8eea8919f749.js
+++ b/priv/static/static/js/5.cfb722ac8eea8919f749.js
--- a/priv/static/static/js/5.cfb722ac8eea8919f749.js.map
+++ b/priv/static/static/js/5.cfb722ac8eea8919f749.js.map
--- a/priv/static/static/js/6.613b0d6b08c3f5f9ef13.js
+++ b/priv/static/static/js/6.613b0d6b08c3f5f9ef13.js
--- a/priv/static/static/js/6.613b0d6b08c3f5f9ef13.js.map
+++ b/priv/static/static/js/6.613b0d6b08c3f5f9ef13.js.map
--- a/priv/static/static/js/6.b0c7a2b19cc70c33dc1e.js
+++ b/priv/static/static/js/6.b0c7a2b19cc70c33dc1e.js
--- a/priv/static/static/js/7.199d52eb458f775043ed.js
+++ b/priv/static/static/js/7.199d52eb458f775043ed.js
--- a/priv/static/static/js/7.199d52eb458f775043ed.js.map
+++ b/priv/static/static/js/7.199d52eb458f775043ed.js.map
--- a/priv/static/static/js/8.7f96f22f9f65ad394684.js
+++ b/priv/static/static/js/8.7f96f22f9f65ad394684.js
--- a/priv/static/static/js/8.7f96f22f9f65ad394684.js.map
+++ b/priv/static/static/js/8.7f96f22f9f65ad394684.js.map
--- a/priv/static/static/js/8.d11ae57b3255a1c74681.js
+++ b/priv/static/static/js/8.d11ae57b3255a1c74681.js
--- a/priv/static/static/js/9.80dc09c85f557dd2c96f.js
+++ b/priv/static/static/js/9.80dc09c85f557dd2c96f.js
--- a/priv/static/static/js/9.80dc09c85f557dd2c96f.js.map
+++ b/priv/static/static/js/9.80dc09c85f557dd2c96f.js.map
--- a/priv/static/static/js/9.f8fc2497d5f27a9df682.js
+++ b/priv/static/static/js/9.f8fc2497d5f27a9df682.js
--- a/priv/static/static/js/9.f8fc2497d5f27a9df682.js.map
+++ b/priv/static/static/js/9.f8fc2497d5f27a9df682.js.map
--- a/Show More
+++ b/Show More
		`@ -1 +1 @@`
			<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link href=/static/css/app.9a4c5ede37b2f0230836.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><script type=text/javascript src=/static/js/vendors~app.fb9ee54b02db0c974e51.js></script><script type=text/javascript src=/static/js/app.ce97bd1883ee9dd7b809.js></script></body></html>				<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link href=/static/css/app.7d2d223f75c3a14b0991.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><script type=text/javascript src=/static/js/vendors~app.cea10ab53f3aa19fc30e.js></script><script type=text/javascript src=/static/js/app.6c972d84b60f601b01f8.js></script></body></html>