remove manual merge switch off

Signed-off-by: Andrew Thornton <art27@cantab.net>
go-gitea · Apr 9, 2021 · 1488f79 · 1488f79
1 parent bc144b6
commit 1488f79
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/integrations/git_test.go b/integrations/git_test.go
@@ -442,15 +442,6 @@ func doMergeFork(ctx, baseCtx APITestContext, baseBranch, headBranch string) fun
 		var pr api.PullRequest
 		var err error
 
-		trueBool := true
-		falseBool := false
-
-		t.Run("AllowSetManuallyMergedAndSwitchOffAutodetectManualMerge", doAPIEditRepository(baseCtx, &api.EditRepoOption{
-			HasPullRequests:       &trueBool,
-			AllowManualMerge:      &trueBool,
-			AutodetectManualMerge: &falseBool,
-		}))
-
 		// Create a test pullrequest
 		t.Run("CreatePullRequest", func(t *testing.T) {
 			pr, err = doAPICreatePullRequest(ctx, baseCtx.Username, baseCtx.Reponame, baseBranch, headBranch)(t)