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

Automerge does not work with agit PR [1.22.0] #31134

Closed
Shuenhoy opened this issue May 28, 2024 · 0 comments · Fixed by #31207
Closed

Automerge does not work with agit PR [1.22.0] #31134

Shuenhoy opened this issue May 28, 2024 · 0 comments · Fixed by #31207
Labels
type/bug
Milestone
1.22.2

Comments

@Shuenhoy
Copy link

Shuenhoy commented May 28, 2024 •
edited
Loading

Description

I saw #31039 is merged in 1.22.0. However, I scheduled an automerge to an agit PR and it didn't automerge.
I then tried checkout the PR and created a normal branch and a new PR. This time, the automerge worked. So this may be a problem related with agit.

Gitea Version

1.22.0

Can you reproduce the bug on the Gitea demo site?

No

Log Gist

No response

Screenshots

image

Git Version

No response

Operating System

No response

How are you running Gitea?

Docker.

Database

PostgreSQL
@lunny lunny added this to the 1.22.1 milestone May 28, 2024
@lunny lunny mentioned this issue Jun 1, 2024
Merged
@lunny lunny modified the milestones: 1.22.1, 1.22.2 Jul 5, 2024
@GiteaBot GiteaBot mentioned this issue Aug 20, 2024
Merged
lunny added a commit that referenced this issue 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>
DennisRasey pushed a commit to DennisRasey/forgejo that referenced this issue 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
Assignees
No one assigned
Labels
type/bug
Projects
None yet
Milestone
1.22.2
Development

Successfully merging a pull request may close this issue.

Fix agit automerge lunny/gitea
2 participants
@lunny @Shuenhoy