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

Adds Status for PR #383

Merged
merged 1 commit into from
Nov 14, 2023
Merged

Adds Status for PR #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion modules/structs/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
4 changes: 2 additions & 2 deletions services/convert/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,

Expand Down
Loading