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

Avoid showing Failed to change the default wiki branch if repo has no wiki when saving repo settings #30329

Merged
merged 5 commits into from
Apr 8, 2024
Merged

Avoid showing Failed to change the default wiki branch if repo has no wiki when saving repo settings #30329

merged 5 commits into from
Apr 8, 2024

Conversation

yp05327
Copy link
Contributor

@yp05327 yp05327 commented Apr 8, 2024

If repo does not have wiki, we should return after save the default wiki branch into DB.
Or you will always see Failed to change the default wiki branch error.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 8, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Apr 8, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Apr 8, 2024
@yp05327 yp05327 changed the title Check whether repo has wiki to avoid showing Failed to change the default wiki branch when saving repo settings Avoid showing Failed to change the default wiki branch if repo has no wiki when saving repo settings Apr 8, 2024
@yp05327 yp05327 requested a review from wxiaoguang April 8, 2024 06:01
@lunny lunny added the backport/v1.22 This PR should be backported to Gitea 1.22 label Apr 8, 2024
@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 Apr 8, 2024
@lunny lunny added the type/bug label Apr 8, 2024
@pull-request-size pull-request-size bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 8, 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 Apr 8, 2024
@wxiaoguang wxiaoguang added the skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. label Apr 8, 2024
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 8, 2024
@lunny lunny merged commit 7d66b9e into go-gitea:main Apr 8, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Apr 8, 2024
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Apr 8, 2024
@yp05327 @GiteaBot
Avoid showing Failed to change the default wiki branch if repo has …
4f5f9b7 
…no wiki when saving repo settings (go-gitea#30329)
@GiteaBot GiteaBot mentioned this pull request Apr 8, 2024
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 Apr 8, 2024
lunny pushed a commit that referenced this pull request Apr 8, 2024
@GiteaBot @yp05327
Avoid showing Failed to change the default wiki branch if repo has …
22a18e6 
…no wiki when saving repo settings (#30329) (#30337)

Backport #30329 by @yp05327

If repo does not have wiki, we should return after save the default wiki
branch into DB.
Or you will always see `Failed to change the default wiki branch` error.

Co-authored-by: yp05327 <576951401@qq.com>
AvengerMoJo pushed a commit to AvengerMoJo/gitea that referenced this pull request Apr 8, 2024
@yp05327 @AvengerMoJo
Avoid showing Failed to change the default wiki branch if repo has …
42eaa4f 
…no wiki when saving repo settings (go-gitea#30329)
@yp05327 yp05327 deleted the fix-change-wiki-defaultbranch-error branch April 8, 2024 23:57
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 9, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
d5add2e 
* giteaofficial/main:
  [skip ci] Updated translations via Crowdin
  Fix missed doer (go-gitea#30231)
  Add optional doctor storage init (go-gitea#30330)
  Avoid running action when action unit is disabled after workflows detected (go-gitea#30331)
  Avoid showing `Failed to change the default wiki branch` if repo has no wiki when saving repo settings (go-gitea#30329)
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

@wxiaoguang wxiaoguang wxiaoguang approved these changes

@delvh delvh delvh approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/v1.22 This PR should be backported to Gitea 1.22 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 size/S Denotes a PR that changes 10-29 lines, ignoring generated files. skip-changelog This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features. type/bug
Projects
None yet
Milestone
1.23.0
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@yp05327 @lunny @wxiaoguang @delvh @GiteaBot