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

6543 · web-flow · commit 3bde29712169 · 2021-04-28T20:24:56.000+01:00
Current subject status can be "", "open" and "closed". This add "merged" to it.
diff --git a/modules/convert/notification.go b/modules/convert/notification.go
@@ -47,6 +47,11 @@ func ToNotificationThread(n *models.Notification) *api.NotificationThread {
 			if err == nil && comment != nil {
 				result.Subject.LatestCommentURL = comment.APIURL()
 			}
+
+			pr, _ := n.Issue.GetPullRequest()
+			if pr != nil && pr.HasMerged {
+				result.Subject.State = "merged"
+			}
 		}
 	case models.NotificationSourceCommit:
 		result.Subject = &api.NotificationSubject{

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,11 @@ func ToNotificationThread(n models.Notification) api.NotificationThread {`
`47`	`47`	`if err == nil && comment != nil {`
`48`	`48`	`result.Subject.LatestCommentURL = comment.APIURL()`
`49`	`49`	`}`
	`50`	`+`
	`51`	`+ pr, _ := n.Issue.GetPullRequest()`
	`52`	`+ if pr != nil && pr.HasMerged {`
	`53`	`+ result.Subject.State = "merged"`
	`54`	`+ }`
`50`	`55`	`}`
`51`	`56`	`case models.NotificationSourceCommit:`
`52`	`57`	`result.Subject = &api.NotificationSubject{`