TRKJ/gitea
2
0
Fork 0
mirror of https://gitee.com/gitea/gitea synced 2025-12-09 09:40:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong hint when status checking is running on pull request view (#9886) (#9928)

Browse Source 
* Fix wrong hint when status checking is running on pull request view

* fix lint

* fix test

* fix test

* fix wrong tmpl

* fix import

* rename function name
This commit is contained in:
Lunny Xiao
2020-01-22 14:06:11 +08:00
committed by Lauris BH
parent db9342c854
commit 0dced15c1a
9 changed files with 159 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
routers/repo/pull.go
View File

@@ -403,7 +403,9 @@ func PrepareViewPullInfo(ctx *context.Context, issue *models.Issue) *git.Compare
}
return false
}
ctx.Data["IsRequiredStatusCheckSuccess"] = pull_service.IsCommitStatusContextSuccess(commitStatuses, pull.ProtectedBranch.StatusCheckContexts)
state := pull_service.MergeRequiredContextsCommitStatus(commitStatuses, pull.ProtectedBranch.StatusCheckContexts)
ctx.Data["RequiredStatusCheckState"] = state
ctx.Data["IsRequiredStatusCheckSuccess"] = state.IsSuccess()
}
ctx.Data["HeadBranchMovedOn"] = headBranchSha != sha