John Olheiser
GitHub
5 years ago
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
2 deletions
-
templates/repo/issue/list.tmpl
-
templates/user/dashboard/issues.tmpl
|
|
|
@@ -268,7 +268,7 @@ |
|
|
|
</a> |
|
|
|
{{end}} |
|
|
|
{{if .IsPull}} |
|
|
|
{{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}} |
|
|
|
|
|
|
|
@@ -170,7 +170,7 @@ |
|
|
|
</span> |
|
|
|
{{end}} |
|
|
|
{{if .IsPull}} |
|
|
|
{{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}} |
|
|
|
|
