Skip to content

Revert #18491, fix oauth2 client link account #35745

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
Merged
merged 2 commits into from
Oct 26, 2025
Merged

Revert #18491, fix oauth2 client link account #35745

merged 2 commits into from
Oct 26, 2025
+4 −11

Conversation

@wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Oct 25, 2025 •
edited
Loading

Fix #35744 by reverting #18491

  • "OpenID" options don't mean "OAuth2Client" options
  • "OAuth2(server)" options don't mean "OAuth2Client" options

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 25, 2025
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Oct 25, 2025
@wxiaoguang wxiaoguang mentioned this pull request Oct 25, 2025
Closed
@wxiaoguang wxiaoguang changed the title Revert #18491 Revert #18491, fix oauth2 client link account Oct 25, 2025
@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 Oct 25, 2025
@wxiaoguang
Copy link
Contributor Author

Doesn't block 1.25.0

@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 Oct 26, 2025
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 26, 2025
@lunny lunny enabled auto-merge (squash) October 26, 2025 20:57
@lunny lunny merged commit 2f309b8 into go-gitea:main Oct 26, 2025
26 checks passed
@GiteaBot GiteaBot added this to the 1.26.0 milestone Oct 26, 2025
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Oct 26, 2025
@wxiaoguang @GiteaBot
Revert go-gitea#18491, fix oauth2 client link account (go-gitea#35745)
f5b16e0 
Fix go-gitea#35744 by reverting go-gitea#18491

* "OpenID" options don't mean "OAuth2Client" options
* "OAuth2(server)" options don't mean "OAuth2Client" options
@GiteaBot GiteaBot mentioned this pull request Oct 26, 2025
Merged
@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 Oct 26, 2025
lunny pushed a commit that referenced this pull request Oct 26, 2025
@GiteaBot @wxiaoguang
Revert #18491, fix oauth2 client link account (#35745) (#35751)
18cc316 
Backport #35745 by @wxiaoguang

Fix #35744 by reverting #18491

* "OpenID" options don't mean "OAuth2Client" options
* "OAuth2(server)" options don't mean "OAuth2Client" options

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@wxiaoguang wxiaoguang deleted the revert-oidc-linkaccount branch October 27, 2025 12:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@lunny lunny lunny approved these changes

+1 more reviewer

@Zettat123 Zettat123 Zettat123 approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

backport/done All backports for this PR have been created backport/v1.25 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

Projects

None yet

Milestone

1.26.0

Development

Successfully merging this pull request may close these issues.

Oauth2 Provider must be enabled for Account Linking by login to work on Oauth2 Client

4 participants

@wxiaoguang @lunny @Zettat123 @GiteaBot