Skip to content

Commit 70b06b8

Browse files
committed
Fix lint
1 parent 04fa8f2 commit 70b06b8

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

services/pull/pull.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ func (errs errlist) Error() string {
631631

632632
// RetargetBranchPulls change target branch for all pull requests whose base branch is the branch
633633
// Both branch and targetBranch must be in the same repo (for security reasons)
634-
func RetargetBranchPulls(ctx context.Context, doer *user_model.User, repoID int64, branch string, targetBranch string) error {
634+
func RetargetBranchPulls(ctx context.Context, doer *user_model.User, repoID int64, branch, targetBranch string) error {
635635
prs, err := issues_model.GetUnmergedPullRequestsByBaseInfo(ctx, repoID, branch)
636636
if err != nil {
637637
return err

tests/integration/actions_trigger_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ func TestCreateDeleteRefEvent(t *testing.T) {
423423
assert.NotNil(t, run)
424424

425425
// delete the branch
426-
err = repo_service.DeleteBranch(db.DefaultContext, user2, repo, gitRepo, "test-create-branch")
426+
err = repo_service.DeleteBranch(db.DefaultContext, user2, repo, gitRepo, "test-create-branch", nil)
427427
assert.NoError(t, err)
428428
run = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{
429429
Title: "add workflow",

0 commit comments

Comments
 (0)