summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Olheiser <john.olheiser@gmail.com>2020-03-25 12:08:00 -0500
committerGitHub <noreply@github.com>2020-03-25 18:08:00 +0100
commitad6f2323b77f048c2d689b22a0610ba33723bec6 (patch)
treef258d4fcaa25bb64258d823e9be22dc4c6196581
parent73f5ca70de9254b3a031570de8a8a5f3ca00ed95 (diff)
downloadgitea-ad6f2323b77f048c2d689b22a0610ba33723bec6.tar.gz
gitea-ad6f2323b77f048c2d689b22a0610ba33723bec6.zip
Fix milestone template (#10824)
Signed-off-by: jolheiser <john.olheiser@gmail.com>
-rw-r--r--templates/repo/issue/milestone_issues.tmpl2
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl
index 6d08df87df..d144a97f14 100644
--- a/templates/repo/issue/milestone_issues.tmpl
+++ b/templates/repo/issue/milestone_issues.tmpl
@@ -249,7 +249,7 @@
{{$.i18n.Tr (TrN $.i18n.Lang $rejectOfficial "repo.pulls.reject_count_1" "repo.pulls.reject_count_n") $rejectOfficial}}
{{end}}
{{end}}
- {{if and (not .PullRequest.HasMerged) ((len .PullRequest.ConflictedFiles) gt 0)}}
+ {{if and (not .PullRequest.HasMerged) (gt (len .PullRequest.ConflictedFiles) 0)}}
<span class="conflicting">{{svg "octicon-mirror" 16}} {{$.i18n.Tr (TrN $.i18n.Lang (len .PullRequest.ConflictedFiles) "repo.pulls.num_conflicting_files_1" "repo.pulls.num_conflicting_files_n") (len .PullRequest.ConflictedFiles)}}</span>
{{end}}
{{end}}