domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Pull request conflict files detection (#5951)

Browse source 
* add conflict detection

* test pull request conflict files

* fix detection files number

* fix comments
This commit is contained in:
Lunny Xiao 2019-02-05 19:54:49 +08:00 • committed by techknowlogick
parent 680a57ce92
commit bf4badad1d
4 changed files with 45 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
templates/repo/issue/view_content/pull.tmpl
View file

@ -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>