diff --git a/modules/structs/pull.go b/modules/structs/pull.go index 415e116ceb..301bd93f45 100644 --- a/modules/structs/pull.go +++ b/modules/structs/pull.go @@ -52,7 +52,7 @@ type PullRequest struct { PinOrder int `json:"pin_order"` - HasConflicts bool `json:"has_conflicts"` // DCS Customizations + Status string `json:"status"` // DCS Customizations ConflictedFiles []string `json:"conflicted_files"` // DCS Customizations } diff --git a/services/convert/pull.go b/services/convert/pull.go index 80c20fe964..39da3ccee5 100644 --- a/services/convert/pull.go +++ b/services/convert/pull.go @@ -74,8 +74,8 @@ func ToAPIPullRequest(ctx context.Context, pr *issues_model.PullRequest, doer *u Updated: pr.Issue.UpdatedUnix.AsTimePtr(), PinOrder: apiIssue.PinOrder, - HasConflicts: pr.IsFilesConflicted(), // DCS Customizations - ConflictedFiles: pr.ConflictedFiles, // DCS Customizations + Status: pr.Status.String(), // DCS Customizations + ConflictedFiles: pr.ConflictedFiles, // DCS Customizations AllowMaintainerEdit: pr.AllowMaintainerEdit,