tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-11-21 21:58:21 +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
routers/web/repo/pull.go
View File

@@ -1152,7 +1152,7 @@ func MergePullRequest(ctx *context.Context) {
}
}
if err := pull_service.Merge(ctx, pr, ctx.Doer, ctx.Repo.GitRepo, repo_model.MergeStyle(form.Do), form.HeadCommitID, message, false); err != nil {
if err := pull_service.Merge(ctx, pr, ctx.Doer, repo_model.MergeStyle(form.Do), form.HeadCommitID, message, false); err != nil {
if pull_service.IsErrInvalidMergeStyle(err) {
ctx.JSONError(ctx.Tr("repo.pulls.invalid_merge_option"))
} else if pull_service.IsErrMergeConflicts(err) {