mirror of
https://github.com/go-gitea/gitea
synced 2025-01-21 23:24:29 +00:00
55e0756c68
Fixes #32769 by the logic from pr #33192 --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
22 lines
1.3 KiB
Handlebars
22 lines
1.3 KiB
Handlebars
{{if and .UpstreamDivergingInfo (or .UpstreamDivergingInfo.BaseHasNewCommits .UpstreamDivergingInfo.HeadCommitsBehind)}}
|
|
<div class="ui message flex-text-block">
|
|
<div class="tw-flex-1">
|
|
{{$upstreamLink := printf "%s/src/branch/%s" .Repository.BaseRepo.Link (.Repository.BaseRepo.DefaultBranch|PathEscapeSegments)}}
|
|
{{$upstreamHtml := HTMLFormat `<a href="%s">%s:%s</a>` $upstreamLink .Repository.BaseRepo.FullName .Repository.BaseRepo.DefaultBranch}}
|
|
{{if .UpstreamDivergingInfo.HeadCommitsBehind}}
|
|
{{ctx.Locale.TrN .UpstreamDivergingInfo.HeadCommitsBehind "repo.pulls.upstream_diverging_prompt_behind_1" "repo.pulls.upstream_diverging_prompt_behind_n" .UpstreamDivergingInfo.HeadCommitsBehind $upstreamHtml}}
|
|
{{else}}
|
|
{{ctx.Locale.Tr "repo.pulls.upstream_diverging_prompt_base_newer" $upstreamHtml}}
|
|
{{end}}
|
|
</div>
|
|
{{if .CanWriteCode}}
|
|
<button class="ui compact primary button tw-m-0 link-action"
|
|
data-modal-confirm-header="{{ctx.Locale.Tr "repo.pulls.upstream_diverging_merge"}}"
|
|
data-modal-confirm-content="{{ctx.Locale.Tr "repo.pulls.upstream_diverging_merge_confirm" .BranchName}}"
|
|
data-url="{{.Repository.Link}}/branches/merge-upstream?branch={{.BranchName}}">
|
|
{{ctx.Locale.Tr "repo.pulls.upstream_diverging_merge"}}
|
|
</button>
|
|
{{end}}
|
|
</div>
|
|
{{end}}
|