From dd136858f1ea40ad3c94191d647487fa4f31926c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 18 Oct 2024 20:33:49 +0200 Subject: Adding upstream version 9.0.0. Signed-off-by: Daniel Baumann --- .../issue/view_content/update_branch_by_merge.tmpl | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 templates/repo/issue/view_content/update_branch_by_merge.tmpl (limited to 'templates/repo/issue/view_content/update_branch_by_merge.tmpl') diff --git a/templates/repo/issue/view_content/update_branch_by_merge.tmpl b/templates/repo/issue/view_content/update_branch_by_merge.tmpl new file mode 100644 index 0000000..adce052 --- /dev/null +++ b/templates/repo/issue/view_content/update_branch_by_merge.tmpl @@ -0,0 +1,37 @@ +{{if and (gt $.Issue.PullRequest.CommitsBehind 0) (not $.Issue.IsClosed) (not $.Issue.PullRequest.IsChecking) (not $.IsPullFilesConflicted) (not $.IsPullRequestBroken)}} +
+
+
+ {{svg "octicon-alert"}} + {{ctx.Locale.Tr "repo.pulls.outdated_with_base_branch"}} +
+
+ {{if and $.UpdateAllowed $.UpdateByRebaseAllowed}} +
+
+ + +
+
+ {{end}} + {{if and $.UpdateAllowed (not $.UpdateByRebaseAllowed)}} +
+ {{$.CsrfTokenHtml}} + +
+ {{end}} +
+
+{{end}} -- cgit v1.2.3