From 9789e0ad531a76f708eba9dddab5381419c6eebe Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Mon, 10 Feb 2020 02:53:41 +0000
Subject: [PATCH] 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>
---
 templates/repo/issue/list.tmpl       | 2 +-
 templates/user/dashboard/issues.tmpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index 9cf6cdd97..ca6fa72b9 100644
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.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}}
diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl
index a5d7c1454..c8cc8b09d 100644
--- a/templates/user/dashboard/issues.tmpl
+++ b/templates/user/dashboard/issues.tmpl
@@ -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}}