Mirrors/gitea
0
0 Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-10-09 11:43:10 +02:00
Code Issues Activity

Add block on official review requests branch protection (#13705)

Browse Source 
Signed-off-by: a1012112796 <1012112796@qq.com>

Co-authored-by: Lauris BH <lauris@nix.lv>
This commit is contained in:
a1012112796andLauris BH authored and GitHub committed 2020-11-28 21:30:46 +02:00
1 parent 7ed5bf8cbe
commit 9c26dc1f3a
14 files changed
+228 -141
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

services/pull/merge.go
+5
View File
@@ -591,6 +591,11 @@ func CheckPRReadyToMerge(pr *models.PullRequest, skipProtectedFilesCheck bool) (
Reason: "There are requested changes",
}
}
if pr.ProtectedBranch.MergeBlockedByOfficialReviewRequests(pr) {
return models.ErrNotAllowedToMerge{
Reason: "There are official review requests",
}
}
if pr.ProtectedBranch.MergeBlockedByOutdatedBranch(pr) {
return models.ErrNotAllowedToMerge{