mirror of
https://github.com/VibedByKaKi/forgejo-11-secure.git
synced 2026-11-05 13:33:28 +01:00
331772ea19
Keep v11.0.16 current with security fixes that are already in a published upstream release, through v17.0.1, v16.0.7, and v15.0.11 (2026-10-26). BACKPORTS.md records what landed, what was skipped, and that v17.0.0 had nothing new. Co-authored-by: KaKi87 <KaKi87@pm.me>
57 lines
2.6 KiB
Go HTML Template
57 lines
2.6 KiB
Go HTML Template
<div class="divider"></div>
|
|
<details class="collapsible">
|
|
<summary class="tw-py-2"> {{ctx.Locale.Tr "repo.pulls.cmd_instruction_hint"}} </summary>
|
|
<div><h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_title"}}</h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_checkout_desc"}}</div>
|
|
{{$localBranch := .PullRequest.HeadBranch}}
|
|
{{if ne .PullRequest.HeadRepo.ID .PullRequest.BaseRepo.ID}}
|
|
{{$localBranch = print .PullRequest.HeadRepo.OwnerName "-" .PullRequest.HeadBranch}}
|
|
{{end}}
|
|
<div class="ui secondary segment">
|
|
{{if eq .PullRequest.Flow 0}}
|
|
<div>git fetch -u {{if ne .PullRequest.HeadRepo.ID .PullRequest.BaseRepo.ID}}<origin-url data-url="{{.PullRequest.HeadRepo.Link}}"></origin-url>{{else}}origin{{end}} '{{.PullRequest.HeadBranch}}:{{$localBranch}}'</div>
|
|
{{else}}
|
|
<div>git fetch -u origin '+refs/pull/{{.PullRequest.Index}}/head:{{$localBranch}}'</div>
|
|
{{end}}
|
|
<div>git checkout '{{$localBranch}}'</div>
|
|
</div>
|
|
{{if .ShowMergeInstructions}}
|
|
<div id="merge-instructions">
|
|
<h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_title"}}</h3>
|
|
{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_desc"}}
|
|
{{if not .AutodetectManualMerge}}
|
|
<p>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_warning"}}</p>
|
|
{{end}}
|
|
</div>
|
|
<div class="ui secondary segment">
|
|
<div data-pull-merge-style="merge">
|
|
<div>git checkout '{{.PullRequest.BaseBranch}}'</div>
|
|
<div>git merge --no-ff '{{$localBranch}}'</div>
|
|
</div>
|
|
<div class="tw-hidden" data-pull-merge-style="rebase">
|
|
<div>git checkout '{{$localBranch}}'</div>
|
|
<div>git rebase '{{.PullRequest.BaseBranch}}'</div>
|
|
<div>git checkout '{{.PullRequest.BaseBranch}}'</div>
|
|
<div>git merge --ff-only '{{$localBranch}}'</div>
|
|
</div>
|
|
<div class="tw-hidden" data-pull-merge-style="rebase-merge">
|
|
<div>git checkout '{{$localBranch}}'</div>
|
|
<div>git rebase '{{.PullRequest.BaseBranch}}'</div>
|
|
<div>git checkout '{{.PullRequest.BaseBranch}}'</div>
|
|
<div>git merge --no-ff '{{$localBranch}}'</div>
|
|
</div>
|
|
<div class="tw-hidden" data-pull-merge-style="squash">
|
|
<div>git checkout '{{.PullRequest.BaseBranch}}'</div>
|
|
<div>git merge --squash '{{$localBranch}}'</div>
|
|
</div>
|
|
<div class="tw-hidden" data-pull-merge-style="fast-forward-only">
|
|
<div>git checkout '{{.PullRequest.BaseBranch}}'</div>
|
|
<div>git merge --ff-only '{{$localBranch}}'</div>
|
|
</div>
|
|
<div class="tw-hidden" data-pull-merge-style="manually-merged">
|
|
<div>git checkout '{{.PullRequest.BaseBranch}}'</div>
|
|
<div>git merge '{{$localBranch}}'</div>
|
|
</div>
|
|
<div>git push origin '{{.PullRequest.BaseBranch}}'</div>
|
|
</div>
|
|
{{end}}
|
|
</details>
|