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

Fix agit automerge #31207

Merged
merged 8 commits into from
Aug 20, 2024
Merged

Fix agit automerge #31207

merged 8 commits into from
Aug 20, 2024

Conversation

lunny
Copy link
Member

@lunny lunny commented Jun 1, 2024

Fix #31134

@lunny lunny added type/bug backport/v1.22 This PR should be backported to Gitea 1.22 labels Jun 1, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 1, 2024
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Jun 1, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Jun 1, 2024
@lunny lunny marked this pull request as ready for review August 20, 2024 05:44
@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 Aug 20, 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 Aug 20, 2024
@lunny lunny merged commit 8b92eba into go-gitea:main Aug 20, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone Aug 20, 2024
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Aug 20, 2024
@lunny @GiteaBot
Fix agit automerge (go-gitea#31207)
9a3a617
@GiteaBot GiteaBot mentioned this pull request Aug 20, 2024
Merged
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Aug 20, 2024
lunny added a commit that referenced this pull request Aug 20, 2024
@GiteaBot @lunny
Fix agit automerge (#31207) (#31881)
a0d1630 
Backport #31207 by @lunny

Fix #31134

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Aug 21, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
e1e2e87 
* 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
@GiteaBot @Gusted
[PORT] Fix agit automerge (gitea#31881)
75fd8f6 
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
Reviewers

@wolfogre wolfogre wolfogre approved these changes

@a1012112796 a1012112796 a1012112796 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/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.23.0
Development

Successfully merging this pull request may close these issues.

Automerge does not work with agit PR [1.22.0]
4 participants
@lunny @wolfogre @a1012112796 @GiteaBot