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

Do not prepare oauth2 config if it is not enabled, do not write config in some sub-commands (#25567) #25576

Merged
merged 1 commit into from Jun 29, 2023

Conversation

wxiaoguang
Copy link
Contributor

Backport #25567

Ref:

And some sub-commands like "generate" / "docs", they do not need to use the ini config

…g in some sub-commands (go-gitea#25567)

Ref:

* go-gitea#25377 (comment)

And some sub-commands like "generate" / "docs", they do not need to use
the ini config
# Conflicts:
#	modules/setting/oauth2.go
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 29, 2023
@GiteaBot GiteaBot added this to the 1.20.0 milestone Jun 29, 2023
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 29, 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 Jun 29, 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 Jun 29, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 29, 2023
@silverwind silverwind merged commit e6f62ee into go-gitea:release/v1.20 Jun 29, 2023
21 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jun 29, 2023
@wxiaoguang wxiaoguang deleted the backport-oauth-secret branch June 29, 2023 04:32
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Sep 27, 2023
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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants