tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-12-07 05:18:29 +00:00
Code Releases Activity

Remove unnecessary function parameter (#35765)

Browse Source
This commit is contained in:
Lunny Xiao
2025-10-31 21:56:08 -07:00
committed by GitHub
parent de70cd3853
commit b148bef471
6 changed files with 11 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/automerge/automerge.go
View File

@@ -260,7 +260,7 @@ func handlePullRequestAutoMerge(pullID int64, sha string) {
return
}
if err := pull_service.Merge(ctx, pr, doer, baseGitRepo, scheduledPRM.MergeStyle, "", scheduledPRM.Message, true); err != nil {
if err := pull_service.Merge(ctx, pr, doer, scheduledPRM.MergeStyle, "", scheduledPRM.Message, true); err != nil {
log.Error("pull_service.Merge: %v", err)
// FIXME: if merge failed, we should display some error message to the pull request page.
// The resolution is add a new column on automerge table named `error_message` to store the error message and displayed