Revert #18491, fix oauth2 client link account #35745
Merged
+4
−11
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GiteaBot
added
the
lgtm/need 2
wxiaoguang
changed the title
lunny
approved these changes
Oct 25, 2025
GiteaBot
added
lgtm/need 1
|
Doesn't block 1.25.0 |
Zettat123
approved these changes
Oct 26, 2025
GiteaBot
added
lgtm/done
lunny
added
the
reviewed/wait-merge
GiteaBot
pushed a commit
to GiteaBot/gitea
that referenced
this pull request
Oct 26, 2025
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
added
backport/done
lunny
pushed a commit
that referenced
this pull request
Oct 26, 2025
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Oct 30, 2025
* giteaofficial/main: [skip ci] Updated translations via Crowdin Revert go-gitea#18491, fix oauth2 client link account (go-gitea#35745) Upgrade go mail to 0.7.2 (go-gitea#35748) [skip ci] Updated translations via Crowdin Support actions and reusable workflows from private repos (go-gitea#32562) Use git model to detect whether branch exist instead of gitrepo method (go-gitea#35459) Fix shutdown waitgroup panic (go-gitea#35676) Intorduce "config edit-ini" sub command to help maintaining INI config file (go-gitea#35735) Improve online runner check (go-gitea#35722) Make "update file" API can create a new file when SHA is not set (go-gitea#35738) Fix review request webhook bug (go-gitea#35339) (go-gitea#35723) Misc tool tweaks (go-gitea#35734) Update dependencies (go-gitea#35733) Make external iframe render work (go-gitea#35730) Remove mermaid margin workaround (go-gitea#35732) # Conflicts: # models/user/user.go
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix #35744 by reverting #18491