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

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
index 49abe01253246e1dae9f1eecdc8e3e7d84cd9429..cc941678b60382cc5d4963544fc953aa794ed9d2 100644 (file)
--- 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{