Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-11-05 23:26:10 +01:00
Code Issues Activity

Merge branch 'patch3' into patch4

Browse Source
This commit is contained in:
NorthRealm 2025-07-08 15:16:42 +08:00
commit afe2deefbb
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
services/mailer/mail.go
View File

@ -193,10 +193,12 @@ func generateMetadataHeaders(repo *repo_model.Repository) map[string]string {
func generateSenderRecipientHeaders(doer, recipient *user_model.User) map[string]string { func generateSenderRecipientHeaders(doer, recipient *user_model.User) map[string]string {
return map[string]string{ return map[string]string{
"X-Gitea-Sender": doer.Name, "X-Gitea-Sender": doer.Name,
"X-Gitea-Recipient": recipient.Name, "X-Gitea-Recipient": recipient.Name,
"X-GitHub-Sender": doer.Name, "X-Gitea-Recipient-Address": recipient.Email,
"X-GitHub-Recipient": recipient.Name, "X-GitHub-Sender": doer.Name,
"X-GitHub-Recipient": recipient.Name,
"X-GitHub-Recipient-Address": recipient.Email,
} }
} }

2
services/mailer/mail_issue_common.go
View File

@ -312,10 +312,8 @@ func generateAdditionalHeadersForIssue(ctx *mailComment, reason string, recipien
maps.Copy(headers, generateSenderRecipientHeaders(ctx.Doer, recipient)) maps.Copy(headers, generateSenderRecipientHeaders(ctx.Doer, recipient))
maps.Copy(headers, generateReasonHeaders(reason)) maps.Copy(headers, generateReasonHeaders(reason))
headers["X-Gitea-Recipient-Address"] = recipient.Email
headers["X-Gitea-Issue-ID"] = issueID headers["X-Gitea-Issue-ID"] = issueID
headers["X-Gitea-Issue-Link"] = ctx.Issue.HTMLURL() headers["X-Gitea-Issue-Link"] = ctx.Issue.HTMLURL()
headers["X-GitHub-Recipient-Address"] = recipient.Email
headers["X-GitLab-Issue-IID"] = issueID headers["X-GitLab-Issue-IID"] = issueID
return headers return headers