Skip to content

Commit 2efc1f5

Browse files
lunnyGusted
authored andcommitted
[PORT] Fix code owners will not be mentioned when a pull request comes from a forked repository (gitea#30476)
Fix go-gitea#30277 Caused by go-gitea#29783 --- - Resolves go-gitea#5842 - Regression from go-gitea#2855 (cherry picked from commit c63060b)
1 parent 5e777a4 commit 2efc1f5

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

services/issue/pull.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ func PullRequestCodeOwnersReview(ctx context.Context, issue *issues_model.Issue,
5151
return nil, err
5252
}
5353

54-
if pr.HeadRepo.IsFork {
55-
return nil, nil
56-
}
57-
5854
if err := pr.LoadBaseRepo(ctx); err != nil {
5955
return nil, err
6056
}
6157

58+
if pr.BaseRepo.IsFork {
59+
return nil, nil
60+
}
61+
6262
repo, err := gitrepo.OpenRepository(ctx, pr.BaseRepo)
6363
if err != nil {
6464
return nil, err

tests/integration/pull_review_test.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,10 +397,18 @@ func TestPullView_CodeOwner(t *testing.T) {
397397
require.NoError(t, err)
398398

399399
session := loginUser(t, "user5")
400-
testPullCreate(t, session, "user5", "test_codeowner_fork", false, forkedRepo.DefaultBranch, "codeowner-basebranch-forked", "Test Pull Request2")
401400

402-
pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadBranch: "codeowner-basebranch-forked"})
401+
// create a pull request on the forked repository, code reviewers should not be mentioned
402+
testPullCreateDirectly(t, session, "user5", "test_codeowner_fork", forkedRepo.DefaultBranch, "", "", "codeowner-basebranch-forked", "Test Pull Request on Forked Repository")
403+
404+
pr := unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: forkedRepo.ID, HeadBranch: "codeowner-basebranch-forked"})
403405
unittest.AssertExistsIf(t, false, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 8})
406+
407+
// create a pull request to base repository, code reviewers should be mentioned
408+
testPullCreateDirectly(t, session, repo.OwnerName, repo.Name, repo.DefaultBranch, forkedRepo.OwnerName, forkedRepo.Name, "codeowner-basebranch-forked", "Test Pull Request3")
409+
410+
pr = unittest.AssertExistsAndLoadBean(t, &issues_model.PullRequest{BaseRepoID: repo.ID, HeadRepoID: forkedRepo.ID, HeadBranch: "codeowner-basebranch-forked"})
411+
unittest.AssertExistsIf(t, true, &issues_model.Review{IssueID: pr.IssueID, Type: issues_model.ReviewTypeRequest, ReviewerID: 8})
404412
})
405413
})
406414
}

0 commit comments

Comments
 (0)