mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 16:40:24 +08:00 
			
		
		
		
	Update mergebase in pr checker (#10586)
This commit is contained in:
		@@ -61,7 +61,7 @@ func checkAndUpdateStatus(pr *models.PullRequest) {
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if !has {
 | 
						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)
 | 
								log.Error("Update[%d]: %v", pr.ID, err)
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user