summaryrefslogtreecommitdiffstats
path: root/services/pull/check.go
diff options
context:
space:
mode:
authorzeripath <art27@cantab.net>2020-03-04 03:53:57 +0000
committerGitHub <noreply@github.com>2020-03-03 21:53:57 -0600
commit4a2b76d9c8e00769d81eed2f149b6da20cc2d339 (patch)
tree02c516f2c4b6b21ba51e1c62f7accacadae95c4e /services/pull/check.go
parent0b3a9c4f851fe7302bbbab91721fd2e641a4ed22 (diff)
downloadgitea-4a2b76d9c8e00769d81eed2f149b6da20cc2d339.tar.gz
gitea-4a2b76d9c8e00769d81eed2f149b6da20cc2d339.zip
Update mergebase in pr checker (#10586)
Diffstat (limited to 'services/pull/check.go')
-rw-r--r--services/pull/check.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/pull/check.go b/services/pull/check.go
index 17f9e047a5..c877cc84ee 100644
--- a/services/pull/check.go
+++ b/services/pull/check.go
@@ -61,7 +61,7 @@ func checkAndUpdateStatus(pr *models.PullRequest) {
}
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)
}
}