From 64bd374803a76c97619fe1e28bfc74f99ec91677 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Mon, 1 Jan 2024 16:21:03 +0100 Subject: [PATCH] [GITEA] notifies admins on new user registration (squash) DeleteByID trivial conflict because of 778ad795fd4a19dc15723b59a846a250034c7c3a Refactor deletion (#28610) (cherry picked from commit 05682614e5ef2462cbb6a1635ca01e296fe03d23) --- services/mailer/mail_admin_new_user_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/mailer/mail_admin_new_user_test.go b/services/mailer/mail_admin_new_user_test.go index be6ecd9791..b89d888ee1 100644 --- a/services/mailer/mail_admin_new_user_test.go +++ b/services/mailer/mail_admin_new_user_test.go @@ -40,7 +40,7 @@ func getTestUsers(t *testing.T) []*user_model.User { func cleanUpUsers(ctx context.Context, users []*user_model.User) { for _, u := range users { - db.DeleteByID(ctx, u.ID, new(user_model.User)) + db.DeleteByID[user_model.User](ctx, u.ID) } }