Skip to content

Fix non-admins unable to automerge PRs from forks (#36833)#36843

Merged
silverwind merged 3 commits intogo-gitea:release/v1.25from
lunny:lunny/backport_36833
Mar 8, 2026
Merged

Fix non-admins unable to automerge PRs from forks (#36833)#36843
silverwind merged 3 commits intogo-gitea:release/v1.25from
lunny:lunny/backport_36833

Conversation

@lunny
Copy link
Member

@lunny lunny commented Mar 6, 2026

backport #36833

Make handlePullRequestAutoMerge correctly check the permissions of the merging user against pr.BaseRepo.

Make `handlePullRequestAutoMerge` correctly check the
permissions of the merging user against pr.BaseRepo.

---------

Co-authored-by: Michael Hoang <enzime@users.noreply.github.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 6, 2026
@GiteaBot GiteaBot added this to the 1.25.5 milestone Mar 6, 2026
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Mar 6, 2026
@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 Mar 7, 2026
@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 Mar 8, 2026
@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 8, 2026
@silverwind silverwind enabled auto-merge (squash) March 8, 2026 09:47
@silverwind silverwind merged commit 4f562da into go-gitea:release/v1.25 Mar 8, 2026
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 8, 2026
@lunny lunny deleted the lunny/backport_36833 branch March 8, 2026 15:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants