|
|
@ -91,11 +91,11 @@ |
|
|
|
<div class="ui label">{{.Repo.FullName}}#{{.Index}}</div> |
|
|
|
<a class="title has-emoji" href="{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}/issues/{{.Index}}">{{.Title}}</a> |
|
|
|
|
|
|
|
{{if .IsPull }} |
|
|
|
{{if (index $.CommitStatus .PullRequest.ID)}} |
|
|
|
{{template "repo/commit_status" (index $.CommitStatus .PullRequest.ID)}} |
|
|
|
{{end}} |
|
|
|
{{end}} |
|
|
|
{{if .IsPull}} |
|
|
|
{{if (index $.CommitStatus .PullRequest.ID)}} |
|
|
|
{{template "repo/commit_status" (index $.CommitStatus .PullRequest.ID)}} |
|
|
|
{{end}} |
|
|
|
{{end}} |
|
|
|
|
|
|
|
{{with .Labels}} |
|
|
|
{{/* If we have any labels, we should show them |
|
|
@ -151,6 +151,11 @@ |
|
|
|
<span class="octicon octicon-calendar"></span><span{{if .IsOverdue}} class="overdue"{{end}}>{{.DeadlineUnix.FormatShort}}</span> |
|
|
|
</span> |
|
|
|
{{end}} |
|
|
|
{{if .IsPull}} |
|
|
|
{{if (len .PullRequest.ConflictedFiles) gt 0}} |
|
|
|
<span class="conflicting"><i class="octicon octicon-mirror"></i> {{$.i18n.Tr "repo.pulls.num_conflicting_files" (len .PullRequest.ConflictedFiles)}}</span> |
|
|
|
{{end}} |
|
|
|
{{end}} |
|
|
|
</p> |
|
|
|
</li> |
|
|
|
{{end}} |
|
|
|