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

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

Merged
merged 2 commits into from
Jun 28, 2023
Merged

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

merged 2 commits into from
Jun 28, 2023

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Jun 28, 2023 •
edited
Loading

Ref:

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

@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 28, 2023
@wxiaoguang wxiaoguang added the backport/v1.20 This PR should be backported to Gitea 1.20 label Jun 28, 2023
@wxiaoguang wxiaoguang added this to the 1.21.0 milestone Jun 28, 2023
@pull-request-size pull-request-size bot removed the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jun 28, 2023
@GiteaBot GiteaBot added the lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. label Jun 28, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jun 28, 2023
@wxiaoguang wxiaoguang changed the title Do not prepare oauth2 config if it is not enabled Do not prepare oauth2 config if it is not enabled, do not write config in some sub-commands Jun 28, 2023
@wxiaoguang
Copy link
Contributor Author

Kindly remind: made more changes after approval

@pull-request-size pull-request-size bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jun 28, 2023
@silverwind silverwind merged commit b4d0036 into go-gitea:main Jun 28, 2023
@GiteaBot
Copy link
Collaborator

I was unable to create a backport for 1.20. @wxiaoguang, please send one manually. 🍵

go run ./contrib/backport 25567
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Jun 28, 2023
@wxiaoguang wxiaoguang deleted the fix-oauth-secret branch June 29, 2023 02:11
wxiaoguang added a commit to wxiaoguang/gitea that referenced this pull request Jun 29, 2023
@wxiaoguang
Do not prepare oauth2 config if it is not enabled, do not write confi…
ac42e99 
…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
@wxiaoguang wxiaoguang mentioned this pull request Jun 29, 2023
Merged
@wxiaoguang wxiaoguang added the backport/done All backports for this PR have been created label Jun 29, 2023
silverwind pushed a commit that referenced this pull request Jun 29, 2023
@wxiaoguang
Do not prepare oauth2 config if it is not enabled, do not write confi…
e6f62ee 
…g in some sub-commands (#25567) (#25576)

Backport #25567

Ref:

* #25377 (comment)

And some sub-commands like "generate" / "docs", they do not need to use
the ini config
@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.
Reviewers

@delvh delvh delvh approved these changes

@techknowlogick techknowlogick techknowlogick approved these changes

@silverwind silverwind silverwind approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.20 This PR should be backported to Gitea 1.20 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. type/bug
Projects
None yet
Milestone
1.21.0
Development

Successfully merging this pull request may close these issues.
5 participants
@wxiaoguang @GiteaBot @silverwind @techknowlogick @delvh