aboutsummaryrefslogtreecommitdiffstats
path: root/routers
diff options
context:
space:
mode:
authorGiteabot <teabot@gitea.io>2024-05-09 00:38:46 +0800
committerGitHub <noreply@github.com>2024-05-08 16:38:46 +0000
commit2f91a461f7f25f9b59c7c54406b4dbe2a44e2fc2 (patch)
tree85ac569b6b59cfaad36294cec977899bd98c943c /routers
parent084bec89ed7ae0816fc2d8db6784ad22523d1fc4 (diff)
downloadgitea-2f91a461f7f25f9b59c7c54406b4dbe2a44e2fc2.tar.gz
gitea-2f91a461f7f25f9b59c7c54406b4dbe2a44e2fc2.zip
Fix misspelling of mergable (#30896) (#30905)
Backport #30896 by @yp05327 https://github.com/go-gitea/gitea/pull/25812#issuecomment-2099833692 Follow #30573 Co-authored-by: yp05327 <576951401@qq.com>
Diffstat (limited to 'routers')
-rw-r--r--routers/api/v1/repo/pull.go4
-rw-r--r--routers/web/repo/pull.go4
2 files changed, 4 insertions, 4 deletions
diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go
index 8bd4ddf64b..38a32a73c7 100644
--- a/routers/api/v1/repo/pull.go
+++ b/routers/api/v1/repo/pull.go
@@ -881,7 +881,7 @@ func MergePullRequest(ctx *context.APIContext) {
}
// start with merging by checking
- if err := pull_service.CheckPullMergable(ctx, ctx.Doer, &ctx.Repo.Permission, pr, mergeCheckType, form.ForceMerge); err != nil {
+ if err := pull_service.CheckPullMergeable(ctx, ctx.Doer, &ctx.Repo.Permission, pr, mergeCheckType, form.ForceMerge); err != nil {
if errors.Is(err, pull_service.ErrIsClosed) {
ctx.NotFound()
} else if errors.Is(err, pull_service.ErrUserNotAllowedToMerge) {
@@ -890,7 +890,7 @@ func MergePullRequest(ctx *context.APIContext) {
ctx.Error(http.StatusMethodNotAllowed, "PR already merged", "")
} else if errors.Is(err, pull_service.ErrIsWorkInProgress) {
ctx.Error(http.StatusMethodNotAllowed, "PR is a work in progress", "Work in progress PRs cannot be merged")
- } else if errors.Is(err, pull_service.ErrNotMergableState) {
+ } else if errors.Is(err, pull_service.ErrNotMergeableState) {
ctx.Error(http.StatusMethodNotAllowed, "PR not in mergeable state", "Please try again later")
} else if models.IsErrDisallowedToMerge(err) {
ctx.Error(http.StatusMethodNotAllowed, "PR is not ready to be merged", err)
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
index 7041175d9a..bbdc6ca631 100644
--- a/routers/web/repo/pull.go
+++ b/routers/web/repo/pull.go
@@ -1007,7 +1007,7 @@ func MergePullRequest(ctx *context.Context) {
}
// start with merging by checking
- if err := pull_service.CheckPullMergable(ctx, ctx.Doer, &ctx.Repo.Permission, pr, mergeCheckType, form.ForceMerge); err != nil {
+ if err := pull_service.CheckPullMergeable(ctx, ctx.Doer, &ctx.Repo.Permission, pr, mergeCheckType, form.ForceMerge); err != nil {
switch {
case errors.Is(err, pull_service.ErrIsClosed):
if issue.IsPull {
@@ -1021,7 +1021,7 @@ func MergePullRequest(ctx *context.Context) {
ctx.JSONError(ctx.Tr("repo.pulls.has_merged"))
case errors.Is(err, pull_service.ErrIsWorkInProgress):
ctx.JSONError(ctx.Tr("repo.pulls.no_merge_wip"))
- case errors.Is(err, pull_service.ErrNotMergableState):
+ case errors.Is(err, pull_service.ErrNotMergeableState):
ctx.JSONError(ctx.Tr("repo.pulls.no_merge_not_ready"))
case models.IsErrDisallowedToMerge(err):
ctx.JSONError(ctx.Tr("repo.pulls.no_merge_not_ready"))