Merge branch 'main' into feature/block-admin-merge-override

GiteaBot · web-flow · commit 94f5f87562ed · 2024-10-23T09:28:47.000+08:00
diff --git a/services/user/user.go b/services/user/user.go
@@ -289,6 +289,7 @@ func DeleteInactiveUsers(ctx context.Context, olderThan time.Duration) error {
 		if err = DeleteUser(ctx, u, false); err != nil {
 			// Ignore inactive users that were ever active but then were set inactive by admin
 			if models.IsErrUserOwnRepos(err) || models.IsErrUserHasOrgs(err) || models.IsErrUserOwnPackages(err) {
+				log.Warn("Inactive user %q has repositories, organizations or packages, skipping deletion: %v", u.Name, err)
 				continue
 			}
 			select {

Original file line number	Diff line number	Diff line change
`@@ -289,6 +289,7 @@ func DeleteInactiveUsers(ctx context.Context, olderThan time.Duration) error {`
`289`	`289`	`if err = DeleteUser(ctx, u, false); err != nil {`
`290`	`290`	`// Ignore inactive users that were ever active but then were set inactive by admin`
`291`	`291`	`if models.IsErrUserOwnRepos(err) \|\| models.IsErrUserHasOrgs(err) \|\| models.IsErrUserOwnPackages(err) {`
	`292`	`+ log.Warn("Inactive user %q has repositories, organizations or packages, skipping deletion: %v", u.Name, err)`
`292`	`293`	`continue`
`293`	`294`	`}`
`294`	`295`	`select {`