Browse Source
Only show conflicted files if not merged (#10197 )
* Only show conflicted files if not merged
* try again
Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
Co-authored-by: techknowlogick <matti@mdranta.net>
for-closed-social
zeripath
4 years ago
committed by
GitHub
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 (len .PullRequest.ConflictedFiles) gt 0}}
{{if and (not .PullRequest.HasMerged) ( (len .PullRequest.ConflictedFiles) gt 0) }}
<span class="conflicting"><i class="octicon octicon-mirror"></i> {{$.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}}
@ -152,7 +152,7 @@
</span>
{{end}}
{{if .IsPull}}
{{if (len .PullRequest.ConflictedFiles) gt 0}}
{{if and (not .PullRequest.HasMerged) ( (len .PullRequest.ConflictedFiles) gt 0) }}
<span class="conflicting"><i class="octicon octicon-mirror"></i> {{$.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}}