5a16c9d9c0
1. Add `<overflow-menu>` web component 2. Rename `<gitea-origin-url>` to `<origin-url>` and make filenames match. <img width="439" alt="image" src="https://github.com/go-gitea/gitea/assets/115237/2fbe4ca4-110b-4ad2-8e17-c1e116ccbd74"> <img width="444" alt="Screenshot 2024-03-02 at 21 36 52" src="https://github.com/go-gitea/gitea/assets/115237/aa8f786e-dc8c-4030-b12d-7cfb74bdfd6e"> <img width="537" alt="Screenshot 2024-03-03 at 03 05 06" src="https://github.com/go-gitea/gitea/assets/115237/fddd50aa-adf1-4b4b-bd7f-caf30c7b2245">   TODO: - [x] Check if removal of `requestAnimationFrame` is possible to avoid flash of content. Likely needs a `MutationObserver`. - [x] Hide tippy when button is removed from DOM. - [x] ~~Implement right-aligned items (https://github.com/go-gitea/gitea/pull/28976)~~. Not going to do it. - [x] Clean up CSS so base element has no background and add background via tailwind instead. - [x] Use it for org and user page. --------- Co-authored-by: Giteabot <teabot@gitea.io> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com> (cherry picked from commit 256a1eeb9a67b18c62a10f5909b584b7b220848a) Conflicts: options/locale/locale_en-US.ini templates/package/content/cargo.tmpl templates/package/content/cran.tmpl templates/package/content/debian.tmpl templates/package/content/maven.tmpl
50 lines
2.3 KiB
Go HTML Template
50 lines
2.3 KiB
Go HTML Template
<div class="divider"></div>
|
|
<div class="instruct-toggle"> {{ctx.Locale.Tr "repo.pulls.cmd_instruction_hint"}} </div>
|
|
<div class="instruct-content gt-mt-3 gt-hidden">
|
|
<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>
|
|
<div>git checkout {{$localBranch}}</div>
|
|
{{else}}
|
|
<div>git fetch -u origin {{.GetGitRefName}}:{{$localBranch}}</div>
|
|
{{end}}
|
|
</div>
|
|
{{if .ShowMergeInstructions}}
|
|
<div><h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_title"}}</h3>{{ctx.Locale.Tr "repo.pulls.cmd_instruction_merge_desc"}}</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="gt-hidden" data-pull-merge-style="rebase">
|
|
<div>git checkout {{.PullRequest.BaseBranch}}</div>
|
|
<div>git merge --ff-only {{$localBranch}}</div>
|
|
</div>
|
|
<div class="gt-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="gt-hidden" data-pull-merge-style="squash">
|
|
<div>git checkout {{.PullRequest.BaseBranch}}</div>
|
|
<div>git merge --squash {{$localBranch}}</div>
|
|
</div>
|
|
<div class="gt-hidden" data-pull-merge-style="fast-forward-only">
|
|
<div>git checkout {{.PullRequest.BaseBranch}}</div>
|
|
<div>git merge --ff-only {{$localBranch}}</div>
|
|
</div>
|
|
<div class="gt-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}}
|
|
</div>
|