Skip to content

Commit 8d9f191

Browse files
authored
Update docs for bad ini syntax in noreply (#15226)
1 parent 113c155 commit 8d9f191

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

custom/conf/app.example.ini

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -689,10 +689,12 @@ DEFAULT_ENABLE_TIMETRACKING = true
689689
; Default value for AllowOnlyContributorsToTrackTime
690690
; Only users with write permissions can track time if this is true
691691
DEFAULT_ALLOW_ONLY_CONTRIBUTORS_TO_TRACK_TIME = true
692-
; Default value for the domain part of the user's email address in the git log
693-
; if he has set KeepEmailPrivate to true. The user's email will be replaced with a
694-
; concatenation of the user name in lower case, "@" and NO_REPLY_ADDRESS.
695-
NO_REPLY_ADDRESS = noreply.%(DOMAIN)s
692+
; Value for the domain part of the user's email address in the git log if user
693+
; has set KeepEmailPrivate to true. The user's email will be replaced with a
694+
; concatenation of the user name in lower case, "@" and NO_REPLY_ADDRESS. Default
695+
; value is "noreply." + DOMAIN, where DOMAIN resolves to the value from server.DOMAIN
696+
; Note: do not use the <DOMAIN> notation below
697+
NO_REPLY_ADDRESS = noreply.<DOMAIN>
696698
; Show Registration button
697699
SHOW_REGISTRATION_BUTTON = true
698700
; Show milestones dashboard page - a view of all the user's milestones

docs/content/doc/advanced/config-cheat-sheet.en-us.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ relation to port exhaustion.
482482
- `DEFAULT_ORG_VISIBILITY`: **public**: Set default visibility mode for organisations, either "public", "limited" or "private".
483483
- `DEFAULT_ORG_MEMBER_VISIBLE`: **false** True will make the membership of the users visible when added to the organisation.
484484
- `ALLOW_ONLY_EXTERNAL_REGISTRATION`: **false** Set to true to force registration only using third-party services.
485-
- `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.
485+
- `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.
486486
The user's email will be replaced with a concatenation of the user name in lower case, "@" and NO_REPLY_ADDRESS.
487487
- `USER_DELETE_WITH_COMMENTS_MAX_TIME`: **0** Minimum amount of time a user must exist before comments are kept when the user is deleted.
488488

0 commit comments

Comments
 (0)