kot.pink / core
forked from tangled.org/core
Monorepo for Tangled — https://tangled.org
fork atom

appview: pulls: do not truncate filename in merge-conflict indicator

oppi.li 31a506aa b3941e39

options
unified split
Changed files
+1 -1
appview
pages
templates
repo
pulls
pull.html
+1 -1
appview/pages/templates/repo/pulls/pull.html 
···

       
226

       
226

       
 

       
              {{ if .Filename }}


     

       
227

       
227

       
 

       
              <li class="flex items-center">


     

       
228

       
228

       
 

       
                {{ i "file-warning" "w-4 h-4 mr-1.5 text-red-500 dark:text-red-300" }}


     

       
229

       

       
-

       
                <span class="font-mono">{{ slice .Filename 0 (sub (len .Filename) 2) }}</span>


     

       

       
229

       
+

       
                <span class="font-mono">{{ .Filename }}</span>


     

       
230

       
230

       
 

       
              </li>


     

       
231

       
231

       
 

       
              {{ else if .Reason }}


     

       
232

       
232

       
 

       
              <li class="flex items-center">