lavender-legacy
/
gitea
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update mergebase in pr checker (#10586)

release/v1.15
zeripath 2020-03-04 03:53:57 +00:00 committed by GitHub
parent 0b3a9c4f85
commit 4a2b76d9c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/pull/check.go
View File

@ -61,7 +61,7 @@ func checkAndUpdateStatus(pr *models.PullRequest) {
} }
if !has { if !has {
if err := pr.UpdateCols("status, conflicted_files"); err != nil { if err := pr.UpdateCols("merge_base", "status", "conflicted_files"); err != nil {
log.Error("Update[%d]: %v", pr.ID, err) log.Error("Update[%d]: %v", pr.ID, err)
} }
} }