Sign in

Search issue titles and bodies, change requests and comments. Private repositories you cannot read are not included.

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/templates/requests.html +1−1

@@ -93,7 +93,7 @@
93 93 <section id="request-changes"{{if .Live}} hx-swap-oob="outerHTML"{{end}}>
94 94 <h2 class="with-more"><span>{{icon "file"}}Changes</span>{{if .FileCount}} <a class="more" href="/r/{{.Name}}/changes/{{.Request.ID}}/files">View changes</a>{{end}}</h2>
95 95 {{if .FileCount}}
96 <p class="muted">{{.FileCount}} file(s) changed{{if .Added}} · <span class="adds">+{{.Added}}</span>{{end}}{{if .Removed}} · <span class="dels">−{{.Removed}}</span>{{end}}{{if .AlreadyMerged}} · merged into {{.Request.Base}}{{end}}</p>
96 <p class="muted">{{.FileCount}} file(s) changed{{if .Added}} · <span class="adds">+{{.Added}}</span>{{end}}{{if .Removed}} · <span class="dels">−{{.Removed}}</span>{{end}}</p>
97 97 {{else if .AlreadyMerged}}
98 98 <p class="muted">Already merged into {{.Request.Base}}.</p>
99 99 {{else}}