vole

Clone

Read only, no credentials:

https://rodent.software/git/vole.git

Write over SSH with a registered key:

git clone ssh://git@0.0.0.0:2222/vole.git

A free and open-source forge that lives in your Git repo.

Stop repeating the merged target in the changes panel

7fef1eea0ed9681c7e49e3036f23fcb6be34dd41 · Keenan Nemetz · 23h ago · parent c980fe53

Stop repeating the merged target in the changes panel

The header already says the request merged into its base and names the
commit. The changes panel said it again beside the file count, which read
as a second, competing status. The fallback for a merged request with no
diff keeps its explanatory wording.

The test now checks the header line and that the panel does not repeat
the target.

server/web_test.go +4−1

@@ -181,11 +181,14 @@ func TestMergedRequestStillShowsWhatLanded(t *testing.T) {
	181	181	if code != 200 {
	182	182	t.Fatalf("merged request page = %d", code)
	183	183	}
	184		for _, want := range []string{"1 file(s) changed", "View changes", "merged into main"} {
		184	for _, want := range []string{"1 file(s) changed", "View changes", "merged into <code>main</code> at"} {
	185	185	if !strings.Contains(body, want) {
	186	186	t.Fatalf("merged request page does not show %q:\n%s", want, body)
	187	187	}
	188	188	}
		189	if strings.Contains(body, "1 file(s) changed · merged into") {
		190	t.Fatalf("the changes panel repeats the merged target the header already gives:\n%s", body)
		191	}
	189	192	code, body = f.get("/r/" + f.repo + "/changes/" + reqID + "/files")
	190	193	if code != 200 {
	191	194	t.Fatalf("merged request files page = %d", code)