sadposter [Mon, 13 Sep 2021 15:13:42 +0000 (16:13 +0100)]
fix config
sadposter [Tue, 7 Sep 2021 09:00:31 +0000 (10:00 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
Haelwenn [Wed, 1 Sep 2021 21:52:56 +0000 (21:52 +0000)]
Merge branch 'small-cleanup' into 'develop'
Remove unused Logger
See merge request pleroma/pleroma!3521
Mark Felder [Wed, 1 Sep 2021 19:56:48 +0000 (14:56 -0500)]
Remove unused Logger
sadposter [Mon, 30 Aug 2021 21:04:42 +0000 (22:04 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
Haelwenn [Sun, 29 Aug 2021 18:51:50 +0000 (18:51 +0000)]
Merge branch 'chores/2.4.1-develop' into 'develop'
Mergeback: 2.4.1
Closes #2758
See merge request pleroma/pleroma!3520
Haelwenn (lanodan) Monnier [Sat, 28 Aug 2021 16:49:04 +0000 (18:49 +0200)]
Merge branch 'release/2.4.1' into chores/2.4.1-develop
Haelwenn (lanodan) Monnier [Sat, 28 Aug 2021 16:31:56 +0000 (18:31 +0200)]
Release 2.4.1
someone [Sun, 15 Aug 2021 17:49:12 +0000 (13:49 -0400)]
mix pleroma.database set_text_search_config now runs concurrently and infinitely
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3514
Ilja [Sat, 14 Aug 2021 11:42:32 +0000 (13:42 +0200)]
Selecting MRF policies didn't work as intended any more
* Policies were put under a new module (Pleroma.Web.ActivityPub.MRF.Policy instead of Pleroma.Web.ActivityPub.MRF), but this wasn't changed in the Pleroma.Web.ActivityPub.MRF @mrf_config_descriptions
* I don't have a unit test to prevent similar problems in the future because I don't find a proper way to do it
* The descriptions in the unit tests are defined in the unit tests, so if someone changes module names in the code, the tests wont see it
* The list is generated in Pleroma.Docs.Generator.list_behaviour_implementations, but I can't do a check in the when clause of the function to see if the provided module is a behaviour or not.
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3509
Tusooa Zhu [Sat, 28 Aug 2021 01:43:50 +0000 (21:43 -0400)]
Make activity search properly use GIN indexes
The original approach to search in GIN indexes is to use
`to_tsvector(text)` in the WHERE clause of the query. According to
postgres docs [pdoc], this method does not make use of the index,
while `to_tsvector(config, text)` does. This commit changed the
query to use the two-argument `to_tsvector()`.
[pdoc]: https://www.postgresql.org/docs/12/textsearch-tables.html
To obtain the search config in use, we make a query to the db first.
The `::regconfig::oid` hack is needed because Postgrex does not support
regconfig type directly [postgrexbug]. I use the conversion from and to
`oid` instead of `text` because I tested in the actual DB and querying
using the conversion via `text` is slow just as the one-argument
`to_tsvector()` variant.
[postgrexbug]: https://github.com/elixir-ecto/postgrex/issues/502
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3519
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2758
Ilja [Sat, 14 Aug 2021 18:42:12 +0000 (18:42 +0000)]
List available frontends also when no static/frontends folder is present yet
* To see what front ends are installed, it ls static/frontends. When this folder doesn't exists yet, it will return an empty array.
* Installing still works since the folder is created during installation already
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3510
Sam Therapy [Sat, 14 Aug 2021 16:08:39 +0000 (11:08 -0500)]
Add Admin-FE menu for StealEmojiPolicy
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3512
Haelwenn [Sat, 28 Aug 2021 16:11:52 +0000 (16:11 +0000)]
Merge branch 'set_text_search_config_timeout' into 'develop'
mix pleroma.database set_text_search_config now runs concurrently and infinitely
See merge request pleroma/pleroma!3514
Haelwenn [Sat, 28 Aug 2021 16:09:55 +0000 (16:09 +0000)]
Merge branch 'docs_add_yunohost_installation' into 'develop'
Add YunoHost to installation guides
See merge request pleroma/pleroma!3497
Haelwenn [Sat, 28 Aug 2021 16:07:35 +0000 (16:07 +0000)]
Merge branch 'features/ingestion-no-nil' into 'develop'
ObjectValidator.stringify_keys: filter out nil values
See merge request pleroma/pleroma!3506
Haelwenn [Sat, 28 Aug 2021 16:06:35 +0000 (16:06 +0000)]
Merge branch 'admin_fe_dont_list_mrf_policies_any_more' into 'develop'
Selecting MRF policies didn't work as intended any more
Closes admin-fe#198
See merge request pleroma/pleroma!3509
Haelwenn [Sat, 28 Aug 2021 15:54:37 +0000 (15:54 +0000)]
Merge branch 'from/develop/tusooa/2758-gin-index-search' into 'develop'
Make activity search properly use GIN indexes
Closes #2758
See merge request pleroma/pleroma!3519
Tusooa Zhu [Sat, 28 Aug 2021 02:31:22 +0000 (22:31 -0400)]
Add changelog for !3519
Tusooa Zhu [Sat, 28 Aug 2021 01:43:50 +0000 (21:43 -0400)]
Make activity search properly use GIN indexes
The original approach to search in GIN indexes is to use
`to_tsvector(text)` in the WHERE clause of the query. According to
postgres docs [pdoc], this method does not make use of the index,
while `to_tsvector(config, text)` does. This commit changed the
query to use the two-argument `to_tsvector()`.
[pdoc]: https://www.postgresql.org/docs/12/textsearch-tables.html
To obtain the search config in use, we make a query to the db first.
The `::regconfig::oid` hack is needed because Postgrex does not support
regconfig type directly [postgrexbug]. I use the conversion from and to
`oid` instead of `text` because I tested in the actual DB and querying
using the conversion via `text` is slow just as the one-argument
`to_tsvector()` variant.
[postgrexbug]: https://github.com/elixir-ecto/postgrex/issues/502
BUG: https://git.pleroma.social/pleroma/pleroma/-/issues/2758
someone [Sun, 15 Aug 2021 17:49:12 +0000 (13:49 -0400)]
mix pleroma.database set_text_search_config now runs concurrently and infinitely
Haelwenn [Sat, 14 Aug 2021 18:42:12 +0000 (18:42 +0000)]
Merge branch 'show_frontends_also_when_no_static_frontends_folder_is_created_yet' into 'develop'
List available frontends also when no static/frontends folder is present yet
Closes admin-fe#201
See merge request pleroma/pleroma!3510
Ilja [Sat, 14 Aug 2021 18:42:12 +0000 (18:42 +0000)]
List available frontends also when no static/frontends folder is present yet
* To see what front ends are installed, it ls static/frontends. When this folder doesn't exists yet, it will return an empty array.
* Installing still works since the folder is created during installation already
Haelwenn [Sat, 14 Aug 2021 18:40:24 +0000 (18:40 +0000)]
Merge branch 'StealEmojiMRF_add_adminFE' into 'develop'
Add Admin-FE menu for StealEmojiPolicy
See merge request pleroma/pleroma!3512
Haelwenn [Sat, 14 Aug 2021 18:32:40 +0000 (18:32 +0000)]
Merge branch 'builder-note' into 'develop'
CommonAPI.Utils.make_note_data/1 --> ActivityPub.Builder.note/1
See merge request pleroma/pleroma!3511
Alex Gleason [Sat, 14 Aug 2021 16:24:55 +0000 (11:24 -0500)]
Builder.note/1: return {:ok, map(), keyword()} like other Builder functions
Sam Therapy [Sat, 14 Aug 2021 16:08:39 +0000 (11:08 -0500)]
Add Admin-FE menu for StealEmojiPolicy
Alex Gleason [Sat, 14 Aug 2021 16:01:06 +0000 (11:01 -0500)]
CommonAPI.Utils.make_note_data/1 --> ActivityPub.Builder.note/1
Ilja [Sat, 14 Aug 2021 11:42:32 +0000 (13:42 +0200)]
Selecting MRF policies didn't work as intended any more
* Policies were put under a new module (Pleroma.Web.ActivityPub.MRF.Policy instead of Pleroma.Web.ActivityPub.MRF), but this wasn't changed in the Pleroma.Web.ActivityPub.MRF @mrf_config_descriptions
* I don't have a unit test to prevent similar problems in the future because I don't find a proper way to do it
* The descriptions in the unit tests are defined in the unit tests, so if someone changes module names in the code, the tests wont see it
* The list is generated in Pleroma.Docs.Generator.list_behaviour_implementations, but I can't do a check in the when clause of the function to see if the provided module is a behaviour or not.
Alex Gleason [Fri, 13 Aug 2021 15:25:42 +0000 (10:25 -0500)]
Streamer: fix crash in MastodonAPI.StatusView
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3508
Haelwenn (lanodan) Monnier [Thu, 12 Aug 2021 08:29:53 +0000 (10:29 +0200)]
Activity.Search: fallback on status resolution on DB Timeout
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3507
Alex Gleason [Wed, 11 Aug 2021 14:38:16 +0000 (09:38 -0500)]
AdminAPI: hotfix for nil report objects
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3504
Haelwenn (lanodan) Monnier [Wed, 11 Aug 2021 17:45:49 +0000 (19:45 +0200)]
maybe_notify_subscribers: Don't create notifications from ingested replies
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3505
Haelwenn (lanodan) Monnier [Tue, 10 Aug 2021 18:33:00 +0000 (20:33 +0200)]
TwitterAPI: Make change_email require body params instead of query
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503
Haelwenn (lanodan) Monnier [Tue, 10 Aug 2021 17:42:03 +0000 (19:42 +0200)]
TwitterAPI: Make change_password require body params instead of query
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503
Haelwenn (lanodan) Monnier [Tue, 10 Aug 2021 05:41:06 +0000 (07:41 +0200)]
ObjectAgePolicy: Fix pattern matching on published
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3500
Ilja [Tue, 10 Aug 2021 06:09:31 +0000 (06:09 +0000)]
Make the OPT recomendation clearer
AFAIK OTP releases are the recomended way of installing, but
* People seem unaware of that and use from source installations because they use the guide with the name of their distro
* People don't know what OTP releases are or what it means
I added a warning on all installation-from-source guides and added the same explanation on the two OTP pages (the miigration to OTP and installing OTP)
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3485
Haelwenn [Fri, 13 Aug 2021 15:55:33 +0000 (15:55 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!3491
kPherox [Mon, 9 Aug 2021 09:03:58 +0000 (09:03 +0000)]
fix: stream out Create Activity
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3499
marcin mikołajczak [Fri, 13 Aug 2021 14:44:29 +0000 (14:44 +0000)]
Translated using Weblate (Polish)
Currently translated at 98.0% (102 of 104 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
marcin mikołajczak [Mon, 26 Jul 2021 17:55:26 +0000 (17:55 +0000)]
Translated using Weblate (Polish)
Currently translated at 75.0% (78 of 104 strings)
Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/pl/
Haelwenn [Fri, 13 Aug 2021 15:42:12 +0000 (15:42 +0000)]
Merge branch 'streamer-crash-fix' into 'develop'
Streamer crash fix
See merge request pleroma/pleroma!3508
Alex Gleason [Fri, 13 Aug 2021 15:25:42 +0000 (10:25 -0500)]
Streamer: fix crash in MastodonAPI.StatusView
rinpatch [Fri, 13 Aug 2021 12:10:52 +0000 (12:10 +0000)]
Merge branch 'dkuku-develop-patch-66061' into 'develop'
Update dev.exs error message to write to stderr.
See merge request pleroma/pleroma!3492
rinpatch [Fri, 13 Aug 2021 12:09:39 +0000 (12:09 +0000)]
Merge branch 'bugfix/status-search-fallback' into 'develop'
Activity.Search: resolve status on DB Timeout
Closes #2566
See merge request pleroma/pleroma!3507
Haelwenn (lanodan) Monnier [Thu, 12 Aug 2021 08:29:53 +0000 (10:29 +0200)]
Activity.Search: fallback on status resolution on DB Timeout
Haelwenn [Wed, 11 Aug 2021 20:30:43 +0000 (20:30 +0000)]
Merge branch 'nil-report-object-hotfix' into 'develop'
AdminAPI: hotfix for nil report objects
See merge request pleroma/pleroma!3504
Haelwenn (lanodan) Monnier [Wed, 11 Aug 2021 19:29:06 +0000 (21:29 +0200)]
ObjectValidator.stringify_keys: filter out nil values
Haelwenn [Wed, 11 Aug 2021 18:50:39 +0000 (18:50 +0000)]
Merge branch 'bugfix/subscriptions-replies' into 'develop'
maybe_notify_subscribers: Normalize Object to check inReplyTo presence
Closes #2732
See merge request pleroma/pleroma!3505
Haelwenn (lanodan) Monnier [Wed, 11 Aug 2021 17:45:49 +0000 (19:45 +0200)]
maybe_notify_subscribers: Don't create notifications from ingested messages
Alex Gleason [Wed, 11 Aug 2021 14:38:16 +0000 (09:38 -0500)]
AdminAPI: hotfix for nil report objects
Haelwenn [Tue, 10 Aug 2021 18:40:13 +0000 (18:40 +0000)]
Merge branch 'bugfix/change_password' into 'develop'
TwitterAPI: Make change_password require body params instead of query
Closes #2740
See merge request pleroma/pleroma!3503
Haelwenn (lanodan) Monnier [Tue, 10 Aug 2021 18:33:00 +0000 (20:33 +0200)]
TwitterAPI: Make change_email require body params instead of query
Haelwenn [Tue, 10 Aug 2021 18:16:02 +0000 (18:16 +0000)]
Merge branch 'bugfix/object-age-create' into 'develop'
ObjectAgePolicy: Fix pattern matching on published
See merge request pleroma/pleroma!3500
Haelwenn (lanodan) Monnier [Tue, 10 Aug 2021 17:42:03 +0000 (19:42 +0200)]
TwitterAPI: Make change_password require body params instead of query
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2740
Haelwenn [Tue, 10 Aug 2021 06:09:31 +0000 (06:09 +0000)]
Merge branch 'docs_make_otp_recommendation_clearer' into 'develop'
Make the OPT recomendation clearer
See merge request pleroma/pleroma!3485
Ilja [Tue, 10 Aug 2021 06:09:31 +0000 (06:09 +0000)]
Make the OPT recomendation clearer
AFAIK OTP releases are the recomended way of installing, but
* People seem unaware of that and use from source installations because they use the guide with the name of their distro
* People don't know what OTP releases are or what it means
I added a warning on all installation-from-source guides and added the same explanation on the two OTP pages (the miigration to OTP and installing OTP)
Haelwenn (lanodan) Monnier [Tue, 10 Aug 2021 05:41:06 +0000 (07:41 +0200)]
ObjectAgePolicy: Fix pattern matching on published
Haelwenn [Mon, 9 Aug 2021 19:10:05 +0000 (19:10 +0000)]
Merge branch 'fix/streaming-api-for-create-activity' into 'develop'
fix: stream out Create Activity
Closes #2691
See merge request pleroma/pleroma!3499
Haelwenn [Mon, 9 Aug 2021 10:02:37 +0000 (10:02 +0000)]
Merge branch 'poll-notification' into 'develop'
MastodonAPI: Support poll notification
See merge request pleroma/pleroma!3484
Haelwenn [Mon, 9 Aug 2021 09:37:59 +0000 (09:37 +0000)]
Merge branch 'simple_policy_reasons_for_instance_specific_policies' into 'develop'
Simple policy reasons for instance specific policies
See merge request pleroma/pleroma!3314
kPherox [Mon, 9 Aug 2021 09:03:58 +0000 (09:03 +0000)]
fix: stream out Create Activity
Haelwenn [Sun, 8 Aug 2021 14:40:51 +0000 (14:40 +0000)]
Merge branch 'chores/2.4.0-develop' into 'develop'
Mergeback: 2.4.0
See merge request pleroma/pleroma!3494
Haelwenn [Sun, 8 Aug 2021 14:37:15 +0000 (14:37 +0000)]
Merge branch 'release/2.4.0' into 'stable'
Release/2.4.0
See merge request pleroma/pleroma!3493
Haelwenn (lanodan) Monnier [Sun, 1 Aug 2021 05:57:33 +0000 (07:57 +0200)]
mix.exs: 2.4.50
Haelwenn (lanodan) Monnier [Sun, 8 Aug 2021 13:21:03 +0000 (15:21 +0200)]
Update PleromaFE Bundle (2.4.0)
based on
51d3d8d255de221f7ac99e41f2f8e56c7d6a21a9
Ilja [Sat, 7 Aug 2021 10:49:28 +0000 (12:49 +0200)]
Add YunoHost to installation guides
matildepark [Fri, 6 Aug 2021 06:41:58 +0000 (08:41 +0200)]
CHANGELOG.md: Fix instances of 2020 being actually 2021
Egor Kislitsyn [Thu, 4 Feb 2021 13:23:21 +0000 (17:23 +0400)]
Improve readability
Ilja [Sun, 17 Jan 2021 13:32:42 +0000 (14:32 +0100)]
Quarantine placeholders
* kePlaceholder and valuePlaceholder of quarantined_instances where in wrong case, should be snake_case
* The mrf simple and transparency exclusion were already OK
Ilja [Sat, 16 Jan 2021 23:06:04 +0000 (00:06 +0100)]
improve changelog entry
Ilja [Sat, 26 Dec 2020 10:35:05 +0000 (11:35 +0100)]
Make transparency_exclusions use tuples in admin-fe
* Make it use tuples
* I also changed the keys for key_placeholder and value_placeholder to use snake_case instead of camelCase
Ilja [Fri, 18 Dec 2020 13:29:38 +0000 (14:29 +0100)]
Add key- and valuePlaceholders for quarantined_instances and mrf_simple
* I also added for keywordpolicy as well now. It was done in the admin-fe, but is better to be done here
* I also added comments to explain why we did the _info keys (backwards compatibility)
Ilja [Mon, 14 Dec 2020 12:18:15 +0000 (13:18 +0100)]
Add transparency_exclusions also to the breaking changes
Ilja [Mon, 14 Dec 2020 12:11:51 +0000 (13:11 +0100)]
Change docs
* ./configuration/mrf.md
* Change example
* ./configuration/cheatsheet.md
* Change descriptions to include that a reason is given
* CHANGELOG.md
* Add as breaking change
Ilja [Sat, 28 Nov 2020 09:34:31 +0000 (10:34 +0100)]
quarantine instances info
Added a new field in the nodeinfo called quarantined_instances_info
This holds an object like `"quarantined_instances_info":{"quarantined_instances":{"quar.inst":{"reason":"whatever reason"}}}}`
Ilja [Fri, 20 Nov 2020 12:48:28 +0000 (13:48 +0100)]
Change what nodeinfo returns without breaking backwards compatibility
* Only for SimplePolicy for now
* I added an extra mrf_simple_info key that has an object as value. The object contains only relevant extra info
Ilja [Fri, 23 Oct 2020 18:27:13 +0000 (20:27 +0200)]
Return maps in node_info
It's easiest (and imo most proper) to use tuples {"instance, "reason"} in BE,
but for FE maps like %{"instance": "instance", "reason", "reason"} are better.
I changed it so that node_info returns maps now for simple_policy and quarantined instances.
Ilja [Mon, 5 Oct 2020 12:13:11 +0000 (14:13 +0200)]
Add database migrations
* SimplePolicy
* quarentine
* transparency_exclusions
Ilja [Mon, 5 Oct 2020 09:26:08 +0000 (11:26 +0200)]
Fixed deprecation warning checks
When a setting was deprecated, the code would stop checking for the rest of the possible deprications. This also meant that the settings weren't rewritten to the new settings for deprecated settings besides the first one.
Ilja [Sat, 3 Oct 2020 10:08:09 +0000 (12:08 +0200)]
config/description.exs: Update quarantine settings to tuples
Ilja [Sat, 3 Oct 2020 09:55:16 +0000 (11:55 +0200)]
make linter happy
Ilja [Fri, 2 Oct 2020 18:35:51 +0000 (20:35 +0200)]
Deprecate transparency_exclusions
* Give deprecation message
* Rewrite configs
Ilja [Fri, 2 Oct 2020 17:08:04 +0000 (19:08 +0200)]
config :mrf, :transparency_exclusions works with tumples now
Ilja [Fri, 2 Oct 2020 14:03:20 +0000 (16:03 +0200)]
Deprecate and rewrite settings for quarentine settings
* This is for the settings, not yet a DB migration
Ilja [Fri, 2 Oct 2020 12:51:39 +0000 (14:51 +0200)]
Make quarentine work with list of tuples instead of strings
Ilja [Fri, 25 Sep 2020 21:36:19 +0000 (23:36 +0200)]
Add tests for setting `:instance, :quarantined_instances`
No test was done for quarantined instances yet. I added a factory for followers_only notes and checked
* That no followers only post is send when the target server is quarantined
* That a followers only post is send when the target server is not quarantined
Ilja [Thu, 24 Sep 2020 19:01:33 +0000 (21:01 +0200)]
Make mrfSimple work with tuples
* Changed SimplePolicy
* I also grepped in test/ for ':mrf_simple' to see what other things could be affected
Ilja [Wed, 23 Sep 2020 22:34:59 +0000 (00:34 +0200)]
Deprectate strings for SimplePolicy
When strings are detected in the simplepolicy, a warning will be given and the config will be changed to use tuples instead
sadposter [Thu, 5 Aug 2021 12:01:25 +0000 (13:01 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
Haelwenn [Thu, 5 Aug 2021 05:51:22 +0000 (05:51 +0000)]
Merge branch 'staff-plug' into 'develop'
Moderators: add UserIsStaffPlug
See merge request pleroma/pleroma!3495
Alex Gleason [Wed, 4 Aug 2021 16:48:57 +0000 (11:48 -0500)]
Merge remote-tracking branch 'pleroma/develop' into staff-plug
sadposter [Mon, 2 Aug 2021 21:10:01 +0000 (22:10 +0100)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
Haelwenn (lanodan) Monnier [Sun, 1 Aug 2021 05:41:24 +0000 (07:41 +0200)]
Release 2.4.0
Haelwenn (lanodan) Monnier [Sun, 1 Aug 2021 06:26:05 +0000 (08:26 +0200)]
Update AdminFE bundle
Daniel [Tue, 27 Jul 2021 21:01:41 +0000 (21:01 +0000)]
use puts instead warn
Daniel [Tue, 27 Jul 2021 20:41:36 +0000 (20:41 +0000)]
Update dev.exs error message to write to stderr. Currently it dumps this message at the beginnig of the file when using vim-autoformat with mix format
feld [Tue, 27 Jul 2021 16:25:34 +0000 (16:25 +0000)]
Merge branch 'object-tombstone-visibility' into 'develop'
Visibility: check Tombstone objects in visible_for_user?/2
See merge request pleroma/pleroma!3490
feld [Tue, 27 Jul 2021 16:24:53 +0000 (16:24 +0000)]
Merge branch 'errorview-json-fix' into 'develop'
Fix errors in ErrorView
See merge request pleroma/pleroma!3489
Alex Gleason [Tue, 27 Jul 2021 13:54:26 +0000 (08:54 -0500)]
Merge remote-tracking branch 'pleroma/develop' into object-tombstone-visibility