Ensure merge_base is updated at time of merge

Signed-off-by: Andrew Thornton <[email protected]>

Author: zeripath

models/pull.go

@@ -406,7 +406,7 @@ func (pr *PullRequest) SetMerged() (bool, error) {
 		return false, fmt.Errorf("Issue.changeStatus: %v", err)
 	}
 
-	if _, err := sess.Where("id = ?", pr.ID).Cols("has_merged, status, merged_commit_id, merger_id, merged_unix").Update(pr); err != nil {
+	if _, err := sess.Where("id = ?", pr.ID).Cols("has_merged, status, merge_base, merged_commit_id, merger_id, merged_unix").Update(pr); err != nil {
 		return false, fmt.Errorf("Failed to update pr[%d]: %v", pr.ID, err)
 	}
 

services/pull/check.go

@@ -180,7 +180,6 @@ func manuallyMerged(pr *models.PullRequest) bool {
 			log.Error("PullRequest[%d].setMerged : %v", pr.ID, err)
 			return false
 		} else if !merged {
-			log.Info("Setting pr #%d in %-v as merged with MergeCommitID %s. Success: %t", pr.Index, pr.BaseRepo, pr.MergedCommitID, merged)
 			return false
 		}
 

services/pull/merge.go

@@ -64,10 +64,8 @@ func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repositor
 	pr.Merger = doer
 	pr.MergerID = doer.ID
 
-	if success, err := pr.SetMerged(); err != nil {
+	if _, err := pr.SetMerged(); err != nil {
 		log.Error("setMerged [%d]: %v", pr.ID, err)
-	} else {
-		log.Info("Setting pr #%d in %-v as merged with MergeCommitID %s. Success: %t", pr.Index, pr.BaseRepo, pr.MergedCommitID, success)
 	}
 
 	if err := pr.LoadIssue(); err != nil {
@@ -661,7 +659,6 @@ func MergedManually(pr *models.PullRequest, doer *models.User, baseGitRepo *git.
 	if merged, err = pr.SetMerged(); err != nil {
 		return
 	} else if !merged {
-		log.Info("Setting pr #%d in %-v as merged with MergeCommitID %s. Success: %t", pr.Index, pr.BaseRepo, pr.MergedCommitID, merged)
 		return fmt.Errorf("SetMerged failed")
 	}