diff --git a/appview/pages/templates/repo/pulls/fragments/pullActions.html b/appview/pages/templates/repo/pulls/fragments/pullActions.html index c3afc2db..2e281de2 100644 --- a/appview/pages/templates/repo/pulls/fragments/pullActions.html +++ b/appview/pages/templates/repo/pulls/fragments/pullActions.html @@ -35,10 +35,6 @@ {{ end }} > {{ if and (not $loading) $isLastRound }} - {{ if and $isOpen $isForkBased (not .HasPipeline) (ne .RepoInfo.Spindle "") }} - {{ template "workflowWarning" . }} - {{ end }} - {{ template "mergeCheck" . }} {{ template "resubmitStatus" . }} {{ end }}
+ + {{ if and (not $loading) $isLastRound }} +
+ {{ if and $isOpen $isForkBased (not .HasPipeline) (ne .RepoInfo.Spindle "") }} + {{ template "workflowWarning" . }} + {{ end }} + {{ template "mergeCheck" . }} +
+ {{ end }} {{ end }} {{ define "workflowWarning" }} @@ -149,7 +154,7 @@
{{ i "triangle-alert" "w-4 h-4 text-amber-600 dark:text-amber-500" }} - Workflow files changed in this round + Workflow files changed
Expand @@ -197,7 +202,7 @@ {{ if .WorkflowsChanged }}
{{ i "triangle-alert" "size-4" }} - Workflow files changed in this round + Workflow files changed
    {{ range .ChangedWorkflowFiles }} diff --git a/appview/pages/templates/repo/pulls/pull.html b/appview/pages/templates/repo/pulls/pull.html index d789b20f..1c793cb9 100644 --- a/appview/pages/templates/repo/pulls/pull.html +++ b/appview/pages/templates/repo/pulls/pull.html @@ -348,6 +348,16 @@ {{ template "submissionInfo" $ }} {{ template "submissionCommits" $ }} {{ template "submissionPipeline" $ }} + {{ if eq $lastIdx $round }} +
    + {{ if $root.Pull.State.IsOpen }} +
    + {{ i "loader-circle" "w-4 h-4 animate-spin" }} + Checking mergeability… +
    + {{ end }} +
    + {{ end }}
{{ end }}