Merge remote-tracking branch 'upstream/main' into limit-repo-size

tests/integration/api_packages_cargo_test.go

@@ -88,7 +88,7 @@ func testPackageCargo(t *testing.T, _ *neturl.URL) {
 		blob, err := commit.GetBlobByPath(path)
 		assert.NoError(t, err)
 
-		content, err := blob.GetBlobContent()
+		content, err := blob.GetBlobContent(1024)
 		assert.NoError(t, err)
 
 		return content

tests/integration/branches_test.go

@@ -34,7 +34,7 @@ func TestDeleteBranch(t *testing.T) {
 func TestUndoDeleteBranch(t *testing.T) {
 	onGiteaRun(t, func(t *testing.T, u *url.URL) {
 		deleteBranch(t)
-		htmlDoc, name := branchAction(t, ".undo-button")
+		htmlDoc, name := branchAction(t, ".restore-branch-button")
 		assert.Contains(t,
 			htmlDoc.doc.Find(".ui.positive.message").Text(),
 			translation.NewLocale("en-US").Tr("repo.branch.restore_success", name),