mirror of
https://github.com/go-gitea/gitea
synced 2025-07-10 12:37:19 +00:00
Merge branch 'main' into lunny/automerge_support_delete_branch
This commit is contained in:
@ -520,7 +520,8 @@ func TestConflictChecking(t *testing.T) {
|
||||
BaseRepo: baseRepo,
|
||||
Type: issues_model.PullRequestGitea,
|
||||
}
|
||||
err = pull.NewPullRequest(git.DefaultContext, baseRepo, pullIssue, nil, nil, pullRequest, nil)
|
||||
prOpts := &pull.NewPullRequestOptions{Repo: baseRepo, Issue: pullIssue, PullRequest: pullRequest}
|
||||
err = pull.NewPullRequest(git.DefaultContext, prOpts)
|
||||
assert.NoError(t, err)
|
||||
|
||||
issue := unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{Title: "PR with conflict!"})
|
||||
|
Reference in New Issue
Block a user