Merge stable 2023.03 #6

Merged
fedward merged 52 commits from AkkomaGang/akkoma:stable into stable 2023-03-11 18:29:39 +00:00
2 changed files with 7 additions and 7 deletions
Showing only changes of commit 292f0444d0 - Show all commits

View file

@ -790,7 +790,7 @@
%{
key: :healthcheck,
type: :boolean,
description: "If enabled, system data will be shown on `/api/pleroma/healthcheck`"
description: "If enabled, system data will be shown on `/api/v1/pleroma/healthcheck`"
},
%{
key: :remote_post_retention_days,

View file

@ -1498,12 +1498,6 @@ msgctxt "config description at :pleroma-:instance > :federation_reachability_tim
msgid "Timeout (in days) of each external federation target being unreachable prior to pausing federating to it"
msgstr ""
#: lib/pleroma/docs/translator.ex:5
#, elixir-autogen, elixir-format
msgctxt "config description at :pleroma-:instance > :healthcheck"
msgid "If enabled, system data will be shown on `/api/pleroma/healthcheck`"
msgstr ""
#: lib/pleroma/docs/translator.ex:5
#, elixir-autogen, elixir-format
msgctxt "config description at :pleroma-:instance > :instance_thumbnail"
@ -5973,3 +5967,9 @@ msgstr ""
msgctxt "config label at :pleroma-Pleroma.Web.Metadata.Providers.Theme > :theme_color"
msgid "Theme color"
msgstr ""
#: lib/pleroma/docs/translator.ex:5
#, elixir-autogen, elixir-format
msgctxt "config description at :pleroma-:instance > :healthcheck"
msgid "If enabled, system data will be shown on `/api/v1/pleroma/healthcheck`"
msgstr ""