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>tags/v1.10.5
zeripath
4 years ago
2 changed files with 2 additions and 2 deletions
+ 1
- 1
templates/repo/issue/list.tmpl
View File
| @@ -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}} | |||
+ 1
- 1
templates/user/dashboard/issues.tmpl
View File
| @@ -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}} | |||
Loading…