From 3bdf9eae01a40ac9dcafdb956861c8a13f3cf917 Mon Sep 17 00:00:00 2001
From: Giteabot <teabot@gitea.io>
Date: Tue, 28 May 2024 18:47:11 +0800
Subject: [PATCH] Add missed return after `ctx.ServerError` (#31130) (#31133)

Backport #31130 by @lunny

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
(cherry picked from commit e6bacf1fed57e33fcbbb7d57782bfc5daa8f2fee)
---
 routers/api/v1/repo/mirror.go | 1 +
 routers/web/admin/repos.go    | 1 +
 routers/web/auth/auth.go      | 1 +
 routers/web/org/projects.go   | 1 +
 routers/web/repo/editor.go    | 1 +
 5 files changed, 5 insertions(+)

diff --git a/routers/api/v1/repo/mirror.go b/routers/api/v1/repo/mirror.go
index 864644e1ef..b959a2b332 100644
--- a/routers/api/v1/repo/mirror.go
+++ b/routers/api/v1/repo/mirror.go
@@ -384,6 +384,7 @@ func CreatePushMirror(ctx *context.APIContext, mirrorOption *api.CreatePushMirro
 	if err = mirror_service.AddPushMirrorRemote(ctx, pushMirror, address); err != nil {
 		if err := repo_model.DeletePushMirrors(ctx, repo_model.PushMirrorOptions{ID: pushMirror.ID, RepoID: pushMirror.RepoID}); err != nil {
 			ctx.ServerError("DeletePushMirrors", err)
+			return
 		}
 		ctx.ServerError("AddPushMirrorRemote", err)
 		return
diff --git a/routers/web/admin/repos.go b/routers/web/admin/repos.go
index ddf4440167..d0339fdd93 100644
--- a/routers/web/admin/repos.go
+++ b/routers/web/admin/repos.go
@@ -94,6 +94,7 @@ func UnadoptedRepos(ctx *context.Context) {
 	repoNames, count, err := repo_service.ListUnadoptedRepositories(ctx, q, &opts)
 	if err != nil {
 		ctx.ServerError("ListUnadoptedRepositories", err)
+		return
 	}
 	ctx.Data["Dirs"] = repoNames
 	pager := context.NewPagination(count, opts.PageSize, opts.Page, 5)
diff --git a/routers/web/auth/auth.go b/routers/web/auth/auth.go
index 1c55256db4..cb88560233 100644
--- a/routers/web/auth/auth.go
+++ b/routers/web/auth/auth.go
@@ -841,6 +841,7 @@ func ActivateEmail(ctx *context.Context) {
 	if email := user_model.VerifyActiveEmailCode(ctx, code, emailStr); email != nil {
 		if err := user_model.ActivateEmail(ctx, email); err != nil {
 			ctx.ServerError("ActivateEmail", err)
+			return
 		}
 
 		log.Trace("Email activated: %s", email.Email)
diff --git a/routers/web/org/projects.go b/routers/web/org/projects.go
index 5105dbff8e..12edd964d2 100644
--- a/routers/web/org/projects.go
+++ b/routers/web/org/projects.go
@@ -571,6 +571,7 @@ func MoveIssues(ctx *context.Context) {
 	form := &movedIssuesForm{}
 	if err = json.NewDecoder(ctx.Req.Body).Decode(&form); err != nil {
 		ctx.ServerError("DecodeMovedIssuesForm", err)
+		return
 	}
 
 	issueIDs := make([]int64, 0, len(form.Issues))
diff --git a/routers/web/repo/editor.go b/routers/web/repo/editor.go
index e8439cb40e..00c3d880a9 100644
--- a/routers/web/repo/editor.go
+++ b/routers/web/repo/editor.go
@@ -604,6 +604,7 @@ func DeleteFilePost(ctx *context.Context) {
 		} else {
 			ctx.ServerError("DeleteRepoFile", err)
 		}
+		return
 	}
 
 	ctx.Flash.Success(ctx.Tr("repo.editor.file_delete_success", ctx.Repo.TreePath))