]> source.dussan.org Git - gitea.git/commitdiff
Update mergebase in pr checker (#10586)
authorzeripath <art27@cantab.net>
Wed, 4 Mar 2020 03:53:57 +0000 (03:53 +0000)
committerGitHub <noreply@github.com>
Wed, 4 Mar 2020 03:53:57 +0000 (21:53 -0600)
services/pull/check.go

index 17f9e047a53a1124ab2993e7705f070845a4a7ce..c877cc84eeab80af46f3ed4a31d7747790b09482 100644 (file)
@@ -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)
                }
        }