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.

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 codeowner detected diff base branch to mergebase (#29783) #29807

Merged
merged 8 commits into from
Mar 17, 2024

Conversation

lunny
Copy link
Member

@lunny lunny commented Mar 15, 2024

Fix #29763
Backport #29783

This PR fixes 2 problems with CodeOwner in the pull request.

  • Don't use the pull request base branch but merge-base as a diff base to detect the code owner.
  • CodeOwner detection in fork repositories will be disabled because almost all the fork repositories will not change CODEOWNERS files but it should not be used on fork repositories' pull requests.

Fix go-gitea#29763

This PR fixes 2 problems with CodeOwner in the pull request.
- Don't use the pull request base branch but merge-base as a diff base to
detect the code owner.
- CodeOwner detection in fork repositories will be disabled because
almost all the fork repositories will not change CODEOWNERS files but it
should not be used on fork repositories' pull requests.

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@lunny lunny added the type/bug label Mar 15, 2024
@lunny lunny added this to the 1.21.9 milestone Mar 15, 2024
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Mar 15, 2024
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Mar 15, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Mar 15, 2024
@github-actions github-actions bot added the modifies/templates This PR modifies the template files label Mar 15, 2024
@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 16, 2024
Copy link
Member

@silverwind silverwind left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bit of a risky backport it seems.

@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 17, 2024
@6543
Copy link
Member

6543 commented Mar 17, 2024

I think it should be fine ... 🤔

@6543 6543 merged commit 85f31eb into go-gitea:release/v1.21 Mar 17, 2024
27 checks passed
@lunny lunny deleted the lunny/fix_codeowner2 branch March 17, 2024 03:55
@lunny lunny mentioned this pull request Mar 18, 2024
@silverwind
Copy link
Member

silverwind commented Mar 18, 2024

I think it should be fine ... 🤔

It wasn't: #29887

lunny added a commit that referenced this pull request Mar 18, 2024
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jun 15, 2024
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 modifies/templates This PR modifies the template files size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants