From 78710946f279d7f326fc7100965f740fd0c5e5bd Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Fri, 7 May 2021 21:12:24 +0200 Subject: [PATCH] Use pulls in commit graph unless pulls are disabled (#15734 & #15740 & #15774) (#15775) * Commit Graph: Pull-Requests should not link to issues (#15734) Use `/pulls` and simplify code. * reverse #15734 partial and comment (#15740) * reverse & comment * Update templates/repo/graph/commits.tmpl Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: zeripath * Use pulls in commit graph unless pulls are disabled Fix #15370 Signed-off-by: Andrew Thornton Co-authored-by: KN4CK3R Co-authored-by: zeripath --- templates/repo/graph/commits.tmpl | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/templates/repo/graph/commits.tmpl b/templates/repo/graph/commits.tmpl index 8f3260ba5..3427aed58 100644 --- a/templates/repo/graph/commits.tmpl +++ b/templates/repo/graph/commits.tmpl @@ -33,14 +33,9 @@ {{range $commit.Refs}} {{$refGroup := .RefGroup}} {{if eq $refGroup "pull"}} - {{if $.HidePRRefs}} - {{if (containGeneric $.SelectedBranches .Name) }} - - {{svg "octicon-git-pull-request" 16 "mr-2"}}#{{.ShortName}} - - {{end}} - {{else}} - + {{if or (not $.HidePRRefs) (containGeneric $.SelectedBranches .Name)}} + + {{svg "octicon-git-pull-request" 16 "mr-2"}}#{{.ShortName}} {{end}}