Co-authored-by: Lauris BH <lauris@nix.lv>tags/v1.10.5
pulls.can_auto_merge_desc = This pull request can be merged automatically. | pulls.can_auto_merge_desc = This pull request can be merged automatically. | ||||
pulls.cannot_auto_merge_desc = This pull request cannot be merged automatically due to conflicts. | pulls.cannot_auto_merge_desc = This pull request cannot be merged automatically due to conflicts. | ||||
pulls.cannot_auto_merge_helper = Merge manually to resolve the conflicts. | pulls.cannot_auto_merge_helper = Merge manually to resolve the conflicts. | ||||
pulls.num_conflicting_files = "%d conflicting files" | |||||
pulls.no_merge_desc = This pull request cannot be merged because all repository merge options are disabled. | pulls.no_merge_desc = This pull request cannot be merged because all repository merge options are disabled. | ||||
pulls.no_merge_helper = Enable merge options in the repository settings or merge the pull request manually. | pulls.no_merge_helper = Enable merge options in the repository settings or merge the pull request manually. | ||||
pulls.no_merge_wip = This pull request can not be merged because it is marked as being a work in progress. | pulls.no_merge_wip = This pull request can not be merged because it is marked as being a work in progress. |
<div class="ui {{if .IsClosed}}{{if .IsPull}}{{if .PullRequest.HasMerged}}purple{{else}}red{{end}}{{else}}red{{end}}{{else}}{{if .IsRead}}white{{else}}green{{end}}{{end}} label">#{{.Index}}</div> | <div class="ui {{if .IsClosed}}{{if .IsPull}}{{if .PullRequest.HasMerged}}purple{{else}}red{{end}}{{else}}red{{end}}{{else}}{{if .IsRead}}white{{else}}green{{end}}{{end}} label">#{{.Index}}</div> | ||||
<a class="title has-emoji" href="{{$.Link}}/{{.Index}}">{{.Title}}</a> | <a class="title has-emoji" href="{{$.Link}}/{{.Index}}">{{.Title}}</a> | ||||
{{if .IsPull }} | |||||
{{if (index $.CommitStatus .PullRequest.ID)}} | |||||
{{template "repo/commit_status" (index $.CommitStatus .PullRequest.ID)}} | |||||
{{if .IsPull }} | |||||
{{if (index $.CommitStatus .PullRequest.ID)}} | |||||
{{template "repo/commit_status" (index $.CommitStatus .PullRequest.ID)}} | |||||
{{end}} | {{end}} | ||||
{{end}} | {{end}} | ||||
<img class="ui avatar image" src="{{.RelAvatarLink}}"> | <img class="ui avatar image" src="{{.RelAvatarLink}}"> | ||||
</a> | </a> | ||||
{{end}} | {{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> | </p> | ||||
</li> | </li> | ||||
{{end}} | {{end}} |
<div class="ui label">{{.Repo.FullName}}#{{.Index}}</div> | <div class="ui label">{{.Repo.FullName}}#{{.Index}}</div> | ||||
<a class="title has-emoji" href="{{AppSubUrl}}/{{.Repo.Owner.Name}}/{{.Repo.Name}}/issues/{{.Index}}">{{.Title}}</a> | <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}} | {{with .Labels}} | ||||
{{/* If we have any labels, we should show them | {{/* If we have any labels, we should show them | ||||
<span class="octicon octicon-calendar"></span><span{{if .IsOverdue}} class="overdue"{{end}}>{{.DeadlineUnix.FormatShort}}</span> | <span class="octicon octicon-calendar"></span><span{{if .IsOverdue}} class="overdue"{{end}}>{{.DeadlineUnix.FormatShort}}</span> | ||||
</span> | </span> | ||||
{{end}} | {{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> | </p> | ||||
</li> | </li> | ||||
{{end}} | {{end}} |
} | } | ||||
} | } | ||||
.conflicting { | |||||
padding-left: 5px; | |||||
} | |||||
.due-date { | .due-date { | ||||
padding-left: 5px; | padding-left: 5px; | ||||
} | } |