mirror of
https://codeberg.org/davrot/forgejo.git
synced 2025-05-28 12:00:01 +02:00
Fix breakage from vendor-update
This commit is contained in:
parent
dad806d3ea
commit
42ec5ce740
7 changed files with 11 additions and 11 deletions
|
@ -139,7 +139,7 @@ func (pr *PullRequest) APIFormat() *api.PullRequest {
|
|||
|
||||
if pr.Status != PullRequestStatusChecking {
|
||||
mergeable := pr.Status != PullRequestStatusConflict
|
||||
apiPullRequest.Mergeable = &mergeable
|
||||
apiPullRequest.Mergeable = mergeable
|
||||
}
|
||||
if pr.HasMerged {
|
||||
apiPullRequest.Merged = &pr.Merged
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue