Movatterモバイル変換

View reviewed changes

GiteaBot added lgtm/need 1This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2This PR needs two approvals by maintainers to be considered for merging. labels

silverwind approved these changes

View reviewed changes

GiteaBot added lgtm/doneThis PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1This PR needs approval from one additional maintainer to be merged. labels

lunny added the reviewed/wait-mergeThis pull request is part of the merge queue. It will be merged soon. label

Merge branch 'main' into lunny/fix_admin_edit_user_email

aa678f1

lunnyenabled auto-merge (squash)

December 1, 2025 23:25

lunny merged commit5340db4 intogo-gitea:main

23 checks passed

GiteaBot added this to the1.26.0 milestone

GiteaBot removed the reviewed/wait-mergeThis pull request is part of the merge queue. It will be merged soon. label

GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request

Fix bug when updating user email (go-gitea#36058)

3e0d858

Fixgo-gitea#20390 We should use `ReplacePrimaryEmailAddress` instead of`AdminAddOrSetPrimaryEmailAddress` when modify user's email from adminpanel. And also we need a database transaction to keep deletion andinsertion succeed at the same time.

GiteaBot mentioned this pull request

Fix bug when updating user email (#36058)#36066

Merged

GiteaBot added the backport/doneAll backports for this PR have been created label

silverwind pushed a commit that referenced this pull request

Fix bug when updating user email (#36058) (#36066)

45cdc5d

Backport#36058 by@lunnyFix#20390 We should use `ReplacePrimaryEmailAddress` instead of`AdminAddOrSetPrimaryEmailAddress` when modify user's email from adminpanel. And also we need a database transaction to keep deletion andinsertion succeed at the same time.Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>

wxiaoguang deleted the lunny/fix_admin_edit_user_email branch

December 2, 2025 03:21

Copy link

Contributor

wxiaoguang commentedDec 2, 2025•
edited
Loading

I have some questions about this change:

AdminAddOrSetPrimaryEmailAddress is still called by API's "EditUser"PATCH /admin/users/{username}
- Why the API doesn't get the fix?
What's wrong with "AdminAddOrSetPrimaryEmailAddress"?
- If it is not fixable, you need to remove it.
- If it is fixable, you need to fix it and add tests.

lunny mentioned this pull request

Fix edit user email bug in API#36068

Merged

zjjhot added a commit to zjjhot/gitea that referenced this pull request

Merge remote-tracking branch 'giteaofficial/main'

1966e98

* giteaofficial/main:  [skip ci] Updated translations via Crowdin  Fix bug when updating user email (go-gitea#36058)  Add "Go to file", "Delete Directory" to repo file list page (go-gitea#35911)  Replace `lint-go-gopls` with additional `govet` linters (go-gitea#36028)  Fix Actions `pull_request.paths` being triggered incorrectly by rebase (go-gitea#36045)

silverwind added a commit to silverwind/gitea that referenced this pull request

Merge remote-tracking branch 'origin/main' into strictNullChecks2

d6dc25a

* origin/main:  [skip ci] Updated translations via Crowdin  Fix bug when updating user email (go-gitea#36058)  Add "Go to file", "Delete Directory" to repo file list page (go-gitea#35911)  Replace `lint-go-gopls` with additional `govet` linters (go-gitea#36028)  Fix Actions `pull_request.paths` being triggered incorrectly by rebase (go-gitea#36045)  Fix error handling in mailer and wiki services (go-gitea#36041)  Update JS deps, fix deprecations (go-gitea#36040)  Fix incorrect viewed files counter if file has changed (go-gitea#36009)

silverwind pushed a commit that referenced this pull request

Fix edit user email bug in API (#36068)

e30a130

Follow#36058 for API edit user bug when editing email.- The Admin Edit User API includes a breaking change. Previously, whenupdating a user with an email from an unallowed domain, the requestwould succeed but return a warning in the response headers. Now, therequest will fail and return an error in the response body instead.- Removed `AdminAddOrSetPrimaryEmailAddress` because it will not be usedany where.Fix#36058 (comment)---------Co-authored-by: Giteabot <teabot@gitea.io>

GiteaBot added a commit to GiteaBot/gitea that referenced this pull request

Fix edit user email bug in API (go-gitea#36068)

d92a16f

Followgo-gitea#36058 for API edit user bug when editing email.- The Admin Edit User API includes a breaking change. Previously, whenupdating a user with an email from an unallowed domain, the requestwould succeed but return a warning in the response headers. Now, therequest will fail and return an error in the response body instead.- Removed `AdminAddOrSetPrimaryEmailAddress` because it will not be usedany where.Fixgo-gitea#36058 (comment)---------Co-authored-by: Giteabot <teabot@gitea.io>

GiteaBot mentioned this pull request

Fix edit user email bug in API (#36068)#36081

Merged

silverwind pushed a commit that referenced this pull request