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.

Sign up for GitHub

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

Jump to bottom

Fix 500 error if there is a name conflict when edit authentication source #23832

Merged
merged 2 commits into from
Mar 31, 2023
Merged

Fix 500 error if there is a name conflict when edit authentication source #23832

merged 2 commits into from
Mar 31, 2023

Conversation

yp05327
Copy link
Contributor

@yp05327 yp05327 commented Mar 31, 2023

No description provided.

@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Mar 31, 2023
@lunny lunny added type/bug outdated/backport/v1.19 This PR should be backported to Gitea 1.19 and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Mar 31, 2023
@yp05327 yp05327 changed the title Fix name conflict to login source Fix 500 error if there is a name conflict when edit authentication source Mar 31, 2023
@codecov-commenter

This comment was marked as off-topic.

Sign in to view
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Mar 31, 2023
@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 Mar 31, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 31, 2023
@lunny lunny merged commit 6e58f84 into go-gitea:main Mar 31, 2023
@lunny lunny removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 31, 2023
@GiteaBot GiteaBot mentioned this pull request Mar 31, 2023
Merged
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Mar 31, 2023
@yp05327 @GiteaBot
Fix 500 error if there is a name conflict when edit authentication so…
8b64cc3 
…urce (go-gitea#23832)
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Mar 31, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 31, 2023
@zjjhot
Merge remote-tracking branch 'giteaoffical/main'
9ada9c1 
* giteaoffical/main:
  Fix 500 error if there is a name conflict when edit authentication source (go-gitea#23832)
  Use different SVG for pending and running actions (go-gitea#23836)
  CSS color tweaks (go-gitea#23828)
  Clarify Gitea/Crowdin locale behaviors, add tests for LocaleStore, fix some strings with semicolons (go-gitea#23819)
techknowlogick pushed a commit that referenced this pull request Mar 31, 2023
@GiteaBot @yp05327
Fix 500 error if there is a name conflict when edit authentication so…
16bfe98 
…urce (#23832) (#23852)

Backport #23832 by @yp05327

Co-authored-by: yp05327 <576951401@qq.com>
@delvh delvh added this to the 1.20.0 milestone Apr 3, 2023
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@Zettat123 Zettat123 Zettat123 approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
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 type/bug
Projects
None yet
Milestone
1.20.0
Development

Successfully merging this pull request may close these issues.
6 participants
@yp05327 @codecov-commenter @lunny @Zettat123 @GiteaBot @delvh