-
-
Notifications
You must be signed in to change notification settings - Fork 5.4k
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
Fix agit automerge #31207
Merged
Merged
Fix agit automerge #31207
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
wolfogre
approved these changes
Aug 20, 2024
a1012112796
approved these changes
Aug 20, 2024
GiteaBot
pushed a commit
to GiteaBot/gitea
that referenced
this pull request
Aug 20, 2024
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Aug 21, 2024
* giteaofficial/main: [skip ci] Updated translations via Crowdin Refactor the usage of batch catfile (go-gitea#31754) Fix agit automerge (go-gitea#31207)
DennisRasey
pushed a commit
to DennisRasey/forgejo
that referenced
this pull request
Aug 21, 2024
Backport go-gitea/gitea#31207 by @lunny Fix go-gitea/gitea#31134 Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com> --- Conflict resolution: none Modification: `s/assert.NoError/require.NoError` (cherry picked from commit a0d1630700073785baff4ebc3031b0480d44cc63)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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/L
Denotes a PR that changes 100-499 lines, ignoring generated files.
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.
Fix #31134