Update mergebase in pr checker (#10586)

zeripath · web-flow · commit 4a2b76d9c8e0 · 2020-03-03T21:53:57.000-06:00
diff --git 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)
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ func checkAndUpdateStatus(pr *models.PullRequest) {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`if !has {`
`64`		`- if err := pr.UpdateCols("status, conflicted_files"); err != nil {`
	`64`	`+ if err := pr.UpdateCols("merge_base", "status", "conflicted_files"); err != nil {`
`65`	`65`	`log.Error("Update[%d]: %v", pr.ID, err)`
`66`	`66`	`}`
`67`	`67`	`}`