p85947160
/
gitea
1
0
Fork 1
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[API] pull notification subject status: add "merged" (#15344) (#15654) 

Current subject status can be "", "open" and "closed". This add "merged" to it.
This commit is contained in:
6543 2021-04-28 21:24:56 +02:00 committed by GitHub
parent 0dfde367c1
commit 3bde297121
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/convert/notification.go
View File

@ -47,6 +47,11 @@ func ToNotificationThread(n *models.Notification) *api.NotificationThread {
if err == nil && comment != nil { if err == nil && comment != nil {
result.Subject.LatestCommentURL = comment.APIURL() result.Subject.LatestCommentURL = comment.APIURL()
} }
pr, _ := n.Issue.GetPullRequest()
if pr != nil && pr.HasMerged {
result.Subject.State = "merged"
}
} }
case models.NotificationSourceCommit: case models.NotificationSourceCommit:
result.Subject = &api.NotificationSubject{ result.Subject = &api.NotificationSubject{