From 70b06b8fcc5b80b216f168193987306ca72abc07 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Sat, 9 Nov 2024 20:38:37 -0800 Subject: [PATCH] Fix lint --- services/pull/pull.go | 2 +- tests/integration/actions_trigger_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/pull/pull.go b/services/pull/pull.go index 43b5f99293..55d7cbe483 100644 --- a/services/pull/pull.go +++ b/services/pull/pull.go @@ -631,7 +631,7 @@ func (errs errlist) Error() string { // RetargetBranchPulls change target branch for all pull requests whose base branch is the branch // Both branch and targetBranch must be in the same repo (for security reasons) -func RetargetBranchPulls(ctx context.Context, doer *user_model.User, repoID int64, branch string, targetBranch string) error { +func RetargetBranchPulls(ctx context.Context, doer *user_model.User, repoID int64, branch, targetBranch string) error { prs, err := issues_model.GetUnmergedPullRequestsByBaseInfo(ctx, repoID, branch) if err != nil { return err diff --git a/tests/integration/actions_trigger_test.go b/tests/integration/actions_trigger_test.go index 4718aa7e73..aa61cc9462 100644 --- a/tests/integration/actions_trigger_test.go +++ b/tests/integration/actions_trigger_test.go @@ -423,7 +423,7 @@ func TestCreateDeleteRefEvent(t *testing.T) { assert.NotNil(t, run) // delete the branch - err = repo_service.DeleteBranch(db.DefaultContext, user2, repo, gitRepo, "test-create-branch") + err = repo_service.DeleteBranch(db.DefaultContext, user2, repo, gitRepo, "test-create-branch", nil) assert.NoError(t, err) run = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{ Title: "add workflow",