From 02f098ee108d9bb42a481896a89dfbb02d787629 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 26 Jul 2019 03:46:25 +0200 Subject: [PATCH 1/2] delet protectin symbol on "action column" --- templates/repo/branch/list.tmpl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index d84298d843d5b..29c637a6f7515 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -94,11 +94,9 @@ {{if and $.IsWriter (not $.IsMirror)}} - {{if .IsProtected}} - - {{else if .IsDeleted}} + {{if and .IsDeleted (not .IsProtected)}} - {{else}} + {{else if (not .IsProtected)}} {{end}} From 6b8ac009d58da15928cc64ac24fae7b9a4c274a1 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 26 Jul 2019 13:51:15 +0200 Subject: [PATCH 2/2] code format --- templates/repo/branch/list.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index 35e726b802c00..ead9f4ba2d929 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -59,7 +59,7 @@
{{.CommitsAhead}}
-
+
{{end}}