opensource/gitea
1
0
Fork 0
mirror of https://gitcode.com/gitea/gitea.git synced 2025-08-06 09:39:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix breakage from vendor-update

Browse Source
This commit is contained in:
Kim "BKC" Carlbäcker
2016-11-29 09:25:47 +01:00
parent dad806d3ea
commit 42ec5ce740
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
models/pull.go
View File

@ -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