Update mergebase in pr checker (#10586) (#10605)

guillep2k · web-flow · commit c9e4d7a56431 · 2020-03-04T18:56:09.000-03:00
diff --git 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)
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ func checkAndUpdateStatus(pr *models.PullRequest) {`
`47`	`47`
`48`	`48`	`// Make sure there is no waiting test to process before leaving the checking status.`
`49`	`49`	`if !pullRequestQueue.Exist(pr.ID) {`
`50`		`- if err := pr.UpdateCols("status, conflicted_files"); err != nil {`
	`50`	`+ if err := pr.UpdateCols("merge_base", "status", "conflicted_files"); err != nil {`
`51`	`51`	`log.Error("Update[%d]: %v", pr.ID, err)`
`52`	`52`	`}`
`53`	`53`	`}`