diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2024-05-21 23:23:22 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-21 23:23:22 +0800 |
| commit | c6cf96d31d80ab79d370a6192fd761b4443daec2 (patch) | |
| tree | 48aa40f8f7e3ac843dcab9f505371f5d9ea34119 /services/repository/commitstatus | |
| parent | 1007ce764ea80b48120b796175d7d1210cbb6f74 (diff) | |
| download | gitea-c6cf96d31d80ab79d370a6192fd761b4443daec2.tar.gz gitea-c6cf96d31d80ab79d370a6192fd761b4443daec2.zip | |
Fix automerge will not work because of some events haven't been triggered (#30780)
Replace #25741
Close #24445
Close #30658
Close #20646
~Depends on #30805~
Since #25741 has been rewritten totally, to make the contribution
easier, I will continue the work in this PR. Thanks @6543
---------
Co-authored-by: 6543 <6543@obermui.de>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Diffstat (limited to 'services/repository/commitstatus')
| -rw-r--r-- | services/repository/commitstatus/commitstatus.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/repository/commitstatus/commitstatus.go b/services/repository/commitstatus/commitstatus.go index 444ae04d0c..adc59abed8 100644 --- a/services/repository/commitstatus/commitstatus.go +++ b/services/repository/commitstatus/commitstatus.go @@ -115,7 +115,7 @@ func CreateCommitStatus(ctx context.Context, repo *repo_model.Repository, creato } if status.State.IsSuccess() { - if err := automerge.MergeScheduledPullRequest(ctx, sha, repo); err != nil { + 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) } } |