ddmt/gitdts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix "Updating branch by merge" bug in "update_branch_by_merge.tmpl" (#23790) (#23825)

Browse Source 
Backport #23790

Fix regression of #22683

Pass all variables into sub-template.

Close #23787
This commit is contained in:
wxiaoguang
2023-03-31 12:15:51 +08:00
committed by GitHub
parent d15f20b2d2
commit a1460333dc
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
templates/repo/issue/view_content/pull.tmpl
View File

@@ -128,7 +128,6 @@
{{- else}}red{{end}}">{{svg "octicon-git-merge" 32}}</a>
<div class="content">
{{template "repo/pulls/status" .}}
{{$canAutoMerge := false}}
{{$showGeneralMergeForm := false}}
<div class="ui attached merge-section segment {{if not $.LatestCommitStatus}}no-header{{end}}">
{{if .Issue.PullRequest.HasMerged}}
@@ -193,7 +192,7 @@
{{end}}
</div>
</div>
{{template "repo/issue/view_content/update_branch_by_merge" (dict "locale" .locale "Issue" .Issue "UpdateAllowed" .UpdateAllowed "UpdateByRebaseAllowed" .UpdateByRebaseAllowed "Link" .Link)}}
{{template "repo/issue/view_content/update_branch_by_merge" $}}
{{else if .Issue.PullRequest.IsChecking}}
<div class="item">
<i class="icon icon-octicon">{{svg "octicon-sync"}}</i>
@@ -286,7 +285,7 @@
</div>
{{end}}
{{end}}
{{template "repo/issue/view_content/update_branch_by_merge" (dict "locale" .locale "Issue" .Issue "UpdateAllowed" .UpdateAllowed "UpdateByRebaseAllowed" .UpdateByRebaseAllowed "Link" .Link)}}
{{template "repo/issue/view_content/update_branch_by_merge" $}}
{{if .Issue.PullRequest.IsEmpty}}
<div class="ui divider"></div>