Merge branch 'short-description' into 'develop'

Add short_description instance field

Closes #2865

See merge request pleroma/pleroma!3651
This commit is contained in:
tusooa 2022-07-13 04:42:24 +00:00
commit fdc71f6051
5 changed files with 13 additions and 0 deletions

View file

@ -187,6 +187,7 @@ config :pleroma, :instance,
email: "example@example.com",
notify_email: "noreply@example.com",
description: "Pleroma: An efficient and flexible fediverse server",
short_description: "",
background_image: "/images/city.jpg",
instance_thumbnail: "/instance/thumbnail.jpeg",
limit: 5_000,

View file

@ -536,6 +536,15 @@ config :pleroma, :config_description, [
"Very cool instance"
]
},
%{
key: :short_description,
type: :string,
description:
"Shorter version of instance description. It can be seen on `/api/v1/instance`",
suggestions: [
"Cool instance"
]
},
%{
key: :limit,
type: :integer,