ajust to go-gitea#19649

6543-forks · May 8, 2022 · f1037f3 · f1037f3
1 parent daf146a
commit f1037f3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
@@ -1074,8 +1074,8 @@ func CancelAutoMergePullRequest(ctx *context.Context) {
 		return
 	}
 
-	if err := pull_model.RemoveScheduledAutoMerge(ctx, ctx.Doer, issue.PullRequest.ID, true); err != nil {
-		if models.IsErrNotExist(err) {
+	if err := automerge.RemoveScheduledAutoMerge(ctx, ctx.Doer, issue.PullRequest); err != nil {
+		if db.IsErrNotExist(err) {
 			ctx.Flash.Error(ctx.Tr("repo.pulls.pull_request_not_scheduled"))
 			ctx.Redirect(fmt.Sprintf("%s/pulls/%d", ctx.Repo.RepoLink, issue.Index))
 			return