Skip to content

Fix oauth2 login methods #32698

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
Dec 3, 2024
Merged

Fix oauth2 login methods #32698

merged 2 commits into from
Dec 3, 2024
+5 −4

Conversation

wxiaoguang
Copy link
Contributor

Regression of #32687

It should use "or" but not "and", otherwise the oauth2 methods won't show when no ENABLE_OPENID_SIGNIN
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 3, 2024
@wxiaoguang wxiaoguang added this to the 1.23.0 milestone Dec 3, 2024
@wxiaoguang wxiaoguang added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Dec 3, 2024
@github-actions github-actions bot added the modifies/templates This PR modifies the template files label Dec 3, 2024
@wxiaoguang wxiaoguang mentioned this pull request Dec 3, 2024
Merged
@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 Dec 3, 2024
@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 Dec 3, 2024
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Dec 3, 2024
@lunny lunny enabled auto-merge (squash) December 3, 2024 17:28
@lunny lunny merged commit 171edfc into go-gitea:main Dec 3, 2024
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Dec 3, 2024
@wxiaoguang wxiaoguang deleted the fix-login-oauth2 branch December 3, 2024 23:45
@wxiaoguang
Copy link
Contributor Author

need to update demo.gitea.com
zjjhot added a commit to zjjhot/gitea that referenced this pull request Dec 4, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
c87deba 
* giteaofficial/main: Fix delete branch perm checking (go-gitea#32654) Refactor markdown editor and use it for milestone description editor (go-gitea#32688) Fix issue title rendering and refactor legacy function names (go-gitea#32703) Fix oauth2 login methods (go-gitea#32698) Fix word overflow in file search page (go-gitea#32695) Add Swift login endpoint (go-gitea#32693) Quick fix for license file name (go-gitea#32696)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Mar 3, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/templates This PR modifies the template files skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.

4 participants

@wxiaoguang @lunny @wolfogre @GiteaBot