Follow @wxiaoguang's suggestion

Author: lunny

routers/web/repo/repo.go

@@ -330,14 +330,12 @@ func rejectTransfer(ctx *context.Context) {
 }
 
 func handleActionError(ctx *context.Context, err error) {
-	if err != nil {
-		if errors.Is(err, user_model.ErrBlockedUser) {
-			ctx.Flash.Error(ctx.Tr("repo.action.blocked_user"))
-		} else if errors.Is(err, util.ErrPermissionDenied) {
-			ctx.Error(http.StatusNotFound)
-		} else {
-			ctx.ServerError(fmt.Sprintf("Action (%s)", ctx.PathParam("action")), err)
-		}
+	if errors.Is(err, user_model.ErrBlockedUser) {
+		ctx.Flash.Error(ctx.Tr("repo.action.blocked_user"))
+	} else if errors.Is(err, util.ErrPermissionDenied) {
+		ctx.Error(http.StatusNotFound)
+	} else {
+		ctx.ServerError(fmt.Sprintf("Action (%s)", ctx.PathParam("action")), err)
 	}
 }
 

services/repository/transfer.go

@@ -399,13 +399,14 @@ func StartRepositoryTransfer(ctx context.Context, doer, newOwner *user_model.Use
 		return err
 	}
 
-	var isTransfer bool
+	var isDirectTransfer bool
 	oldOwnerName := repo.OwnerName
 
 	if err := db.WithTx(ctx, func(ctx context.Context) error {
-		// Admin is always allowed to transfer || user transfer repo back to his account
+		// Admin is always allowed to transfer || user transfer repo back to his account,
+		// then it will transfer directly without acceptance.
 		if doer.IsAdmin || doer.ID == newOwner.ID {
-			isTransfer = true
+			isDirectTransfer = true
 			return transferOwnership(ctx, doer, newOwner.Name, repo, teams)
 		}
 
@@ -420,7 +421,7 @@ func StartRepositoryTransfer(ctx context.Context, doer, newOwner *user_model.Use
 				return err
 			}
 			if allowed {
-				isTransfer = true
+				isDirectTransfer = true
 				return transferOwnership(ctx, doer, newOwner.Name, repo, teams)
 			}
 		}
@@ -443,7 +444,7 @@ func StartRepositoryTransfer(ctx context.Context, doer, newOwner *user_model.Use
 		return err
 	}
 
-	if isTransfer {
+	if isDirectTransfer {
 		notify_service.TransferRepository(ctx, doer, repo, oldOwnerName)
 	} else {
 		// notify users who are able to accept / reject transfer