nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'chore/descriptions-improvements' into 'develop'

Browse source 
More descriptions improvements

See merge request pleroma/pleroma!3307
This commit is contained in:
rinpatch 2021-02-08 19:21:01 +00:00
parent ff70d71693 ce7c275fb3
commit a52cedba62
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
config/description.exs
View file

@ -99,7 +99,8 @@
key: :base_url, key: :base_url,
label: "Base URL", label: "Base URL",
type: :string, type: :string,
description: "Base URL for the uploads, needed if you use CDN", description:
"Base URL for the uploads. Required if you use a CDN or host attachments under a different domain.",
suggestions: [ suggestions: [
"https://cdn-host.com" "https://cdn-host.com"
] ]
@ -1508,7 +1509,8 @@
%{ %{
key: :max_body_length, key: :max_body_length,
type: :integer, type: :integer,
description: "Maximum file size allowed through the Pleroma MediaProxy cache." description:
"Maximum file size (in bytes) allowed through the Pleroma MediaProxy cache."
}, },
%{ %{
key: :max_read_duration, key: :max_read_duration,
@ -1558,7 +1560,7 @@
key: :min_content_length, key: :min_content_length,
type: :integer, type: :integer,
description: description:
"Min content length to perform preview, in bytes. If greater than 0, media smaller in size will be served as is, without thumbnailing." "Min content length (in bytes) to perform preview. Media smaller in size will be served without thumbnailing."
} }
] ]
}, },
@ -1606,6 +1608,7 @@
}, },
%{ %{
key: :url_format, key: :url_format,
label: "URL Format",
type: :string, type: :string,
description: description:
"Optional URL format preprocessing. Only required for Apache's htcacheclean.", "Optional URL format preprocessing. Only required for Apache's htcacheclean.",
@ -2851,7 +2854,7 @@
type: :integer, type: :integer,
description: description:
"Activity pub routes (except question activities). Default: `nil` (no expiration).", "Activity pub routes (except question activities). Default: `nil` (no expiration).",
suggestions: [30_000, nil] suggestions: [nil]
}, },
%{ %{
key: :activity_pub_question, key: :activity_pub_question,
@ -3289,9 +3292,9 @@
}, },
%{ %{
key: :ip_whitelist, key: :ip_whitelist,
label: "IP Whitelist",
type: [{:list, :string}, {:list, :charlist}, {:list, :tuple}], type: [{:list, :string}, {:list, :charlist}, {:list, :tuple}],
description: description: "Restrict access of app metrics endpoint to the specified IP addresses."
"[Pleroma extension] If non-empty, restricts access to app metrics endpoint to specified IP addresses."
}, },
%{ %{
key: :auth, key: :auth,