From c9e4d7a56431752e8f074bb71380eabc2117760d Mon Sep 17 00:00:00 2001 From: guillep2k <18600385+guillep2k@users.noreply.github.com> Date: Wed, 4 Mar 2020 18:56:09 -0300 Subject: [PATCH] Update mergebase in pr checker (#10586) (#10605) --- services/pull/check.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/pull/check.go b/services/pull/check.go index 56561b7bbd..e2f39ce163 100644 --- a/services/pull/check.go +++ b/services/pull/check.go @@ -47,7 +47,7 @@ func checkAndUpdateStatus(pr *models.PullRequest) { // Make sure there is no waiting test to process before leaving the checking status. if !pullRequestQueue.Exist(pr.ID) { - 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) } }