diff options
| author | Kyle D <kdumontnu@gmail.com> | 2021-03-31 15:13:46 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-31 17:13:46 -0400 |
| commit | 8d9f191195eaafd6b697683cd5f8c89c3f6e7cf6 (patch) | |
| tree | cc7d7c216ac3838e25c5454f2d6c38ce54310c5d | |
| parent | 113c1557ff2dc0ae379709d7a9607e567c70e1d1 (diff) | |
| download | gitea-8d9f191195eaafd6b697683cd5f8c89c3f6e7cf6.tar.gz gitea-8d9f191195eaafd6b697683cd5f8c89c3f6e7cf6.zip | |
Update docs for bad ini syntax in noreply (#15226)
| -rw-r--r-- | custom/conf/app.example.ini | 10 | ||||
| -rw-r--r-- | docs/content/doc/advanced/config-cheat-sheet.en-us.md | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini index 1e0cd5f280..29b8846ede 100644 --- a/custom/conf/app.example.ini +++ b/custom/conf/app.example.ini @@ -689,10 +689,12 @@ DEFAULT_ENABLE_TIMETRACKING = true ; Default value for AllowOnlyContributorsToTrackTime ; Only users with write permissions can track time if this is true DEFAULT_ALLOW_ONLY_CONTRIBUTORS_TO_TRACK_TIME = true -; Default value for the domain part of the user's email address in the git log -; if he has set KeepEmailPrivate to true. The user's email will be replaced with a -; concatenation of the user name in lower case, "@" and NO_REPLY_ADDRESS. -NO_REPLY_ADDRESS = noreply.%(DOMAIN)s +; Value for the domain part of the user's email address in the git log if user +; has set KeepEmailPrivate to true. The user's email will be replaced with a +; concatenation of the user name in lower case, "@" and NO_REPLY_ADDRESS. Default +; value is "noreply." + DOMAIN, where DOMAIN resolves to the value from server.DOMAIN +; Note: do not use the <DOMAIN> notation below +NO_REPLY_ADDRESS = noreply.<DOMAIN> ; Show Registration button SHOW_REGISTRATION_BUTTON = true ; Show milestones dashboard page - a view of all the user's milestones diff --git a/docs/content/doc/advanced/config-cheat-sheet.en-us.md b/docs/content/doc/advanced/config-cheat-sheet.en-us.md index 255bfb2b95..7aafb82048 100644 --- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md +++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md @@ -482,7 +482,7 @@ relation to port exhaustion. - `DEFAULT_ORG_VISIBILITY`: **public**: Set default visibility mode for organisations, either "public", "limited" or "private". - `DEFAULT_ORG_MEMBER_VISIBLE`: **false** True will make the membership of the users visible when added to the organisation. - `ALLOW_ONLY_EXTERNAL_REGISTRATION`: **false** Set to true to force registration only using third-party services. -- `NO_REPLY_ADDRESS`: **DOMAIN** Default value for the domain part of the user's email address in the git log if he has set KeepEmailPrivate to true. +- `NO_REPLY_ADDRESS`: **noreply.DOMAIN** Value for the domain part of the user's email address in the git log if user has set KeepEmailPrivate to true. DOMAIN resolves to the value in server.DOMAIN. The user's email will be replaced with a concatenation of the user name in lower case, "@" and NO_REPLY_ADDRESS. - `USER_DELETE_WITH_COMMENTS_MAX_TIME`: **0** Minimum amount of time a user must exist before comments are kept when the user is deleted. |