alice.pds.demo.boltless.dev
This repository has no description
appview/pages: move merge check info into round card
was a minor regression from manual-runs
Signed-off-by: oppiliappan <me@oppi.li>
author
oppiliappan
committer
Tangled
date
(Jul 22, 2026, 1:20 PM +0300)
commit
16beabbe
16beabbe2b0f642fa4c3193baa7676d8449e779f
parent
7727c9ca
7727c9cac219e52c25e11362f9f3730c7df6fa39
change-id
xmsrzkzs
xmsrzkzslrtykwsllnsxwvulmymroyzx
+21
-6
+11
-6
appview/pages/templates/repo/pulls/fragments/pullActions.html
+11
-6
appview/pages/templates/repo/pulls/fragments/pullActions.html
···
35
35
{{ end }}
36
36
>
37
37
{{ if and (not $loading) $isLastRound }}
38
-
{{ if and $isOpen $isForkBased (not .HasPipeline) (ne .RepoInfo.Spindle "") }}
39
-
{{ template "workflowWarning" . }}
40
-
{{ end }}
41
-
{{ template "mergeCheck" . }}
42
38
{{ template "resubmitStatus" . }}
43
39
{{ end }}
44
40
<div id="actions-{{$roundNumber}}" hx-target="this" class="flex flex-wrap gap-2 relative"
···
142
138
{{ end }}
143
139
</div>
144
140
</div>
141
+
142
+
{{ if and (not $loading) $isLastRound }}
143
+
<div id="mergecheck-banner" hx-swap-oob="innerHTML">
144
+
{{ if and $isOpen $isForkBased (not .HasPipeline) (ne .RepoInfo.Spindle "") }}
145
+
{{ template "workflowWarning" . }}
146
+
{{ end }}
147
+
{{ template "mergeCheck" . }}
148
+
</div>
149
+
{{ end }}
145
150
{{ end }}
146
151
147
152
{{ define "workflowWarning" }}
···
149
154
<details class="group/ci">
150
155
<summary class="flex items-center gap-2 cursor-pointer list-none">
151
156
{{ i "triangle-alert" "w-4 h-4 text-amber-600 dark:text-amber-500" }}
152
-
<span class="font-medium text-amber-600 dark:text-amber-500">Workflow files changed in this round</span>
157
+
<span class="font-medium text-amber-600 dark:text-amber-500">Workflow files changed</span>
153
158
<div class="text-sm text-gray-500 dark:text-gray-400">
154
159
<span class="group-open/ci:hidden inline">Expand</span>
155
160
<span class="hidden group-open/ci:inline">Collapse</span>
···
197
202
{{ if .WorkflowsChanged }}
198
203
<div class="flex items-center gap-2 text-amber-600 dark:text-amber-500">
199
204
{{ i "triangle-alert" "size-4" }}
200
-
<span class="font-medium">Workflow files changed in this round</span>
205
+
<span class="font-medium">Workflow files changed</span>
201
206
</div>
202
207
<ul class="space-y-1 overflow-x-auto pl-6">
203
208
{{ range .ChangedWorkflowFiles }}
+10
appview/pages/templates/repo/pulls/pull.html
+10
appview/pages/templates/repo/pulls/pull.html
···
348
348
{{ template "submissionInfo" $ }}
349
349
{{ template "submissionCommits" $ }}
350
350
{{ template "submissionPipeline" $ }}
351
+
{{ if eq $lastIdx $round }}
352
+
<div id="mergecheck-banner">
353
+
{{ if $root.Pull.State.IsOpen }}
354
+
<div class="flex items-center gap-2 text-gray-500 dark:text-gray-400">
355
+
{{ i "loader-circle" "w-4 h-4 animate-spin" }}
356
+
<span>Checking mergeability…</span>
357
+
</div>
358
+
{{ end }}
359
+
</div>
360
+
{{ end }}
351
361
</div>
352
362
</div>
353
363
{{ end }}