mirror of
https://github.com/go-gitea/gitea.git
synced 2026-05-06 08:26:41 -04:00
wxiaoguang
6ba907d89c
1. Fix ugly commit form "warning" message 2. Use JSONError for "Update PR Branch" response 3. Remove useless "timeline" class 4. Make timeline review default to "comment" to avoid icon missing 5. Align PR's "command line instructions" UI 6. Simply "Update PR branch" button logic And then some TODOs are fixed. --------- Signed-off-by: wxiaoguang <wxiaoguang@gmail.com>
25 lines
889 B
Handlebars
25 lines
889 B
Handlebars
{{$data := $.MergeBoxData}}
|
|
{{$issueLink := $.IssueLink}}
|
|
<div class="tw-w-full flex-left-right">
|
|
<div class="flex-text-block">
|
|
{{svg "octicon-alert"}}
|
|
{{ctx.Locale.Tr "repo.pulls.outdated_with_base_branch"}}
|
|
</div>
|
|
{{if $data.UpdateAllowed}}
|
|
<div class="ui buttons" data-global-init="initRepoPullRequestUpdate">
|
|
<button class="ui button link-action" data-url="{{$issueLink}}/update">
|
|
{{ctx.Locale.Tr "repo.pulls.update_branch"}}
|
|
</button>
|
|
{{if $data.UpdateByRebaseAllowed}}
|
|
<div class="ui dropdown icon button">
|
|
{{svg "octicon-triangle-down"}}
|
|
<div class="menu">
|
|
<a class="item selected" data-update-url="{{$issueLink}}/update">{{ctx.Locale.Tr "repo.pulls.update_branch"}}</a>
|
|
<a class="item" data-update-url="{{$issueLink}}/update?style=rebase">{{ctx.Locale.Tr "repo.pulls.update_branch_rebase"}}</a>
|
|
</div>
|
|
</div>
|
|
{{end}}
|
|
</div>
|
|
{{end}}
|
|
</div>
|