Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only validate changed columns when update user #24867

Merged
merged 3 commits into from
May 24, 2023

Conversation

lunny
Copy link
Member

@lunny lunny commented May 23, 2023

Fix #23211
Replace #23496

@lunny lunny added type/bug outdated/backport/v1.19 This PR should be backported to Gitea 1.19 labels May 23, 2023
@lunny lunny added this to the 1.20.0 milestone May 23, 2023
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 23, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label May 23, 2023
@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 May 24, 2023
@yp05327
Copy link
Contributor

yp05327 commented May 24, 2023

Not related to this PR, but it seems that we can merge UpdateUserCols and UpdateUser into one?

Copy link
Contributor

@wxiaoguang wxiaoguang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Maybe a test could make the code more stable.

@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 May 24, 2023
@lunny
Copy link
Member Author

lunny commented May 24, 2023

Maybe in future, it needs some work.

@pull-request-size pull-request-size bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels May 24, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 24, 2023
@lunny lunny enabled auto-merge (squash) May 24, 2023 07:01
@lunny lunny merged commit a523bd5 into go-gitea:main May 24, 2023
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request May 24, 2023
@GiteaBot GiteaBot added backport/done All backports for this PR have been created and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels May 24, 2023
lunny added a commit that referenced this pull request May 24, 2023
Backport #24867 by @lunny

Fix #23211
Replace #23496

---------

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 25, 2023
* upstream/main: (21 commits)
  `zh-cn` translation for usage docs (go-gitea#24897)
  Add chinese documentations for installation (go-gitea#24904)
  Improve RunMode / dev mode (go-gitea#24886)
  Add chinese documentations for `Packages` (go-gitea#24914)
  Rework notifications list (go-gitea#24812)
  New webhook trigger for receiving Pull Request review requests (go-gitea#24481)
  Use file filters action instead of Github's files filter (go-gitea#24877)
  Update Asciidoc markup example with safe defaults (go-gitea#24920)
  Add self to maintainers (go-gitea#23644)
  Create pull request for base after editing file, if not enabled on fork (go-gitea#24841)
  Reduce verbosity of dev commands (go-gitea#24917)
  Merge different languages for language stats (go-gitea#24900)
  Add missing test case and fix typo in tests (go-gitea#24915)
  Improve confusable character string (go-gitea#24911)
  Improve Actions CSS (go-gitea#24864)
  Fix <empty> in administration/config-cheat-sheet.en-us.md (go-gitea#24905)
  Only validate changed columns when update user (go-gitea#24867)
  Rename docs packages title from xxx Packages Repository -> xxx Package Registry (go-gitea#24895)
  Fix can’t move anymore items in repo project boards (go-gitea#24892)
  Make environment-to-ini  support loading key value from file (go-gitea#24832)
  ...

# Conflicts:
#	web_src/css/helpers.css
Codeberg-org pushed a commit to Codeberg-org/gitea that referenced this pull request Jun 3, 2023
…itea#24903)

Backport go-gitea#24867 by @lunny

Fix go-gitea#23211
Replace go-gitea#23496

---------

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
(cherry picked from commit 275abd6)
@lunny lunny deleted the lunny/fix_login_validate branch July 19, 2023 09:56
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 22, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. outdated/backport/v1.19 This PR should be backported to Gitea 1.19 size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

500 Server Error after login if User has no allowed visibility mode
4 participants