Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add pull "merged" notification subject status to API #15344

Merged
merged 5 commits into from
Apr 9, 2021
Merged

Add pull "merged" notification subject status to API #15344

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db1c3f7
API: pull notification subject status: add "merged"
6543 Apr 8, 2021
15c0f40
Merge branch 'master' into notif-api_issue-pull_state
6543 Apr 8, 2021
190abf7
Update modules/convert/notification.go
6543 Apr 8, 2021
9afda12
Merge branch 'master' into notif-api_issue-pull_state
6543 Apr 8, 2021
cbf058b
Merge branch 'master' into notif-api_issue-pull_state
lunny Apr 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions modules/convert/notification.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
6543 marked this conversation as resolved.
Show resolved Hide resolved
if pr != nil && pr.HasMerged {
result.Subject.State = "merged"
}
}
case models.NotificationSourceCommit:
result.Subject = &api.NotificationSubject{
Expand Down