Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Pleroma
pleroma
Commits
a52cedba
Commit
a52cedba
authored
Feb 08, 2021
by
rinpatch
Browse files
Merge branch 'chore/descriptions-improvements' into 'develop'
More descriptions improvements See merge request
!3307
parents
ff70d716
ce7c275f
Pipeline
#34753
passed with stages
in 89 minutes and 29 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
config/description.exs
View file @
a52cedba
...
...
@@ -99,7 +99,8 @@
key:
:base_url
,
label:
"Base URL"
,
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:
[
"https://cdn-host.com"
]
...
...
@@ -1508,7 +1509,8 @@
%{
key:
:max_body_length
,
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
,
...
...
@@ -1558,7 +1560,7 @@
key:
:min_content_length
,
type:
:integer
,
description:
"Min content length to perform preview
, in bytes. If greater than 0, m
edia smaller in size will be served
as is,
without thumbnailing."
"Min content length
(in bytes)
to perform preview
. M
edia smaller in size will be served without thumbnailing."
}
]
},
...
...
@@ -1606,6 +1608,7 @@
},
%{
key:
:url_format
,
label:
"URL Format"
,
type:
:string
,
description:
"Optional URL format preprocessing. Only required for Apache's htcacheclean."
,
...
...
@@ -2851,7 +2854,7 @@
type:
:integer
,
description:
"Activity pub routes (except question activities). Default: `nil` (no expiration)."
,
suggestions:
[
30_000
,
nil
]
suggestions:
[
nil
]
},
%{
key:
:activity_pub_question
,
...
...
@@ -3289,9 +3292,9 @@
},
%{
key:
:ip_whitelist
,
label:
"IP Whitelist"
,
type:
[{
:list
,
:string
},
{
:list
,
:charlist
},
{
:list
,
:tuple
}],
description:
"[Pleroma extension] If non-empty, restricts access to app metrics endpoint to specified IP addresses."
description:
"Restrict access of app metrics endpoint to the specified IP addresses."
},
%{
key:
:auth
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment