Skip to content

Conversation

@GiteaBot
Copy link
Collaborator

@GiteaBot GiteaBot commented Apr 1, 2024

Backport #30206 by @wxiaoguang

  1. check IsActive before calling IsLastAdminUser.
  2. Fix some comments and error messages.
  3. Don't return err if "removing file" fails in DeleteUser.
  4. Remove incorrect DeleteInactiveEmailAddresses. Active users could also have inactive emails, and inactive emails do not support "olderThan"
  5. Add tests

1. check `IsActive` before calling `IsLastAdminUser`.
2. Fix some comments and error messages.
3. Don't `return err` if "removing file" fails in `DeleteUser`.
4. Remove incorrect `DeleteInactiveEmailAddresses`. Active users could
also have inactive emails, and inactive emails do not support
"olderThan"
5. Add tests
@GiteaBot GiteaBot added modifies/go Pull requests that update Go code type/bug type/refactoring Existing code has been cleaned up. There should be no new functionality. labels Apr 1, 2024
@GiteaBot GiteaBot added this to the 1.22.0 milestone Apr 1, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 1, 2024
@GiteaBot GiteaBot requested review from lunny and silverwind April 1, 2024 02:06
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Apr 1, 2024
@wxiaoguang wxiaoguang enabled auto-merge (squash) April 1, 2024 04:58
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Apr 1, 2024
@wxiaoguang wxiaoguang merged commit 98a81be into go-gitea:release/v1.22 Apr 1, 2024
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/go Pull requests that update Go code type/bug type/refactoring Existing code has been cleaned up. There should be no new functionality.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants