diff --git a/services/automerge/automerge.go b/services/automerge/automerge.go index 1fd7bfd6c4..daad7be5f8 100644 --- a/services/automerge/automerge.go +++ b/services/automerge/automerge.go @@ -284,7 +284,7 @@ func handlePullRequestAutoMerge(pullID int64, sha string) { } // We don't check doer's permission here because their permissions have been checked - // before ids were stored to the auto_merge table + // before the pull request was scheduled to auto merge perm := access_model.Permission{AccessMode: perm.AccessModeWrite} if err := pull_service.CheckPullMergeable(ctx, doer, &perm, pr, pull_service.MergeCheckTypeGeneral, false); err != nil { diff --git a/services/automerge/notify.go b/services/automerge/notify.go index cb078214f6..dfc192b493 100644 --- a/services/automerge/notify.go +++ b/services/automerge/notify.go @@ -27,7 +27,7 @@ func (n *automergeNotifier) PullRequestReview(ctx context.Context, pr *issues_mo // as a missing / blocking reviews could have blocked a pending automerge let's recheck if review.Type == issues_model.ReviewTypeApprove { if err := StartPRCheckAndAutoMergeBySHA(ctx, review.CommitID, pr.BaseRepo); err != nil { - log.Error("StartPullRequestAutoMergeCheckBySHA: %v", err) + log.Error("StartPRCheckAndAutoMergeBySHA: %v", err) } } } diff --git a/services/repository/commitstatus/commitstatus.go b/services/repository/commitstatus/commitstatus.go index adc59abed8..d874176469 100644 --- a/services/repository/commitstatus/commitstatus.go +++ b/services/repository/commitstatus/commitstatus.go @@ -116,7 +116,7 @@ func CreateCommitStatus(ctx context.Context, repo *repo_model.Repository, creato if status.State.IsSuccess() { if err := automerge.StartPRCheckAndAutoMergeBySHA(ctx, sha, repo); err != nil { - return fmt.Errorf("MergeScheduledPullRequest[repo_id: %d, user_id: %d, sha: %s]: %w", repo.ID, creator.ID, sha, err) + return fmt.Errorf("StartPRCheckAndAutoMergeBySHA[repo_id: %d, user_id: %d, sha: %s]: %w", repo.ID, creator.ID, sha, err) } }