-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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
Restore deleted branches when syncing #29898
Merged
Merged
Conversation
This file contains 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
This PR needs two approvals by maintainers to be considered for merging.
label
Mar 19, 2024
pull-request-size
bot
added
the
size/S
Denotes a PR that changes 10-29 lines, ignoring generated files.
label
Mar 19, 2024
lunny
approved these changes
Mar 19, 2024
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
Mar 19, 2024
lunny
added
the
skip-changelog
This PR is irrelevant for the (next) changelog, for example bug fixes for unreleased features.
label
Mar 19, 2024
silverwind
approved these changes
Mar 20, 2024
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
Mar 20, 2024
lunny
added
the
reviewed/wait-merge
This pull request is part of the merge queue. It will be merged soon.
label
Mar 20, 2024
GiteaBot
removed
the
reviewed/wait-merge
This pull request is part of the merge queue. It will be merged soon.
label
Mar 20, 2024
silverwind
added a commit
to silverwind/gitea
that referenced
this pull request
Mar 20, 2024
* origin/main: Fix loadOneBranch panic (go-gitea#29938) Fix comment review avatar alignment (go-gitea#29935) Remove the negative margin from `.page-content` (go-gitea#29922) Move notifications to a standalone file (go-gitea#29930) Remove unnecessary ".Link" usages (go-gitea#29929) Remove unnecessary ".Link" usages (go-gitea#29909) Show Actions post step when it's running (go-gitea#29926) Fix the wrong default value of ENABLE_OPENID_SIGNIN on docs (go-gitea#29925) Restore deleted branches when syncing (go-gitea#29898) Don't lock using GitHub actions (go-gitea#29913) Remove jQuery `.attr` from the user search box (go-gitea#29919) Remove jQuery `.attr` from the archive download and compare page branch selector (go-gitea#29918) Remove jQuery `.attr` from the image diff (go-gitea#29917) Remove jQuery `.attr` from the quick pull request button text (go-gitea#29916) Remove jQuery `.attr` from the issue author dropdown (go-gitea#29915)
silverwind
added a commit
to silverwind/gitea
that referenced
this pull request
Mar 20, 2024
* origin/main: Fix loadOneBranch panic (go-gitea#29938) Fix comment review avatar alignment (go-gitea#29935) Remove the negative margin from `.page-content` (go-gitea#29922) Move notifications to a standalone file (go-gitea#29930) Remove unnecessary ".Link" usages (go-gitea#29929) Remove unnecessary ".Link" usages (go-gitea#29909) Show Actions post step when it's running (go-gitea#29926) Fix the wrong default value of ENABLE_OPENID_SIGNIN on docs (go-gitea#29925) Restore deleted branches when syncing (go-gitea#29898) Don't lock using GitHub actions (go-gitea#29913) Remove jQuery `.attr` from the user search box (go-gitea#29919) Remove jQuery `.attr` from the archive download and compare page branch selector (go-gitea#29918) Remove jQuery `.attr` from the image diff (go-gitea#29917) Remove jQuery `.attr` from the quick pull request button text (go-gitea#29916) Remove jQuery `.attr` from the issue author dropdown (go-gitea#29915) Switch to the maintained vitest extension (go-gitea#29914)
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/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
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.
Regression of #29493. If a branch has been deleted, repushing it won't restore it.
Lunny may have noticed that, but I didn't delve into the comment then overlooked it: #29493 (comment)
The additional comments added are to explain the issue I found during testing, which are unrelated to the fixes.