aboutsummaryrefslogtreecommitdiffstats
path: root/templates/repo
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2019-02-05 19:54:49 +0800
committertechknowlogick <matti@mdranta.net>2019-02-05 06:54:49 -0500
commitbf4badad1d68c18d7ffb92c69e09e4e8aa252935 (patch)
tree9e8c3a41eba604738e632d921a2de97334e35e03 /templates/repo
parent680a57ce921f6d8c8752fa27aad6c95865fe8127 (diff)
downloadgitea-bf4badad1d68c18d7ffb92c69e09e4e8aa252935.tar.gz
gitea-bf4badad1d68c18d7ffb92c69e09e4e8aa252935.zip
Pull request conflict files detection (#5951)
* add conflict detection * test pull request conflict files * fix detection files number * fix comments
Diffstat (limited to 'templates/repo')
-rw-r--r--templates/repo/issue/view_content/pull.tmpl9
1 files changed, 9 insertions, 0 deletions
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>