From bf4badad1d68c18d7ffb92c69e09e4e8aa252935 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Tue, 5 Feb 2019 19:54:49 +0800
Subject: Pull request conflict files detection (#5951)

* add conflict detection

* test pull request conflict files

* fix detection files number

* fix comments
---
 templates/repo/issue/view_content/pull.tmpl | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'templates/repo/issue')

diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index 72808d089b..0ddb2820fc 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -38,6 +38,7 @@
 	{{if .Issue.PullRequest.HasMerged}}purple
 	{{else if .Issue.IsClosed}}grey
 	{{else if .IsPullWorkInProgress}}grey
+	{{else if .IsFilesConflicted}}grey
 	{{else if .IsPullRequestBroken}}red
 	{{else if .IsBlockedByApprovals}}red
 	{{else if .Issue.PullRequest.IsChecking}}yellow
@@ -59,6 +60,14 @@
 				<div class="item text grey">
 					{{$.i18n.Tr "repo.pulls.reopen_to_merge"}}
 				</div>
+			{{else if .IsPullFilesConflicted}}
+				<div class="item text grey">
+					<span class="octicon octicon-x"></span>
+					{{$.i18n.Tr "repo.pulls.files_conflicted"}}
+					{{range .ConflictedFiles}}
+						<div>{{.}}</div>
+					{{end}}
+				</div>
 			{{else if .IsPullRequestBroken}}
 				<div class="item text red">
 					<span class="octicon octicon-x"></span>
-- 
cgit v1.2.3