diff options
| author | a1012112796 <1012112796@qq.com> | 2020-11-29 03:30:46 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-28 21:30:46 +0200 |
| commit | 9c26dc1f3a742280baff4e9578545bc822016764 (patch) | |
| tree | ac997d23e59a658b387302ecd65e76a39d99b9e8 /routers | |
| parent | 7ed5bf8cbe06bf2cfc4980cf6e020dc46dd71a79 (diff) | |
| download | gitea-9c26dc1f3a742280baff4e9578545bc822016764.tar.gz gitea-9c26dc1f3a742280baff4e9578545bc822016764.zip | |
Add block on official review requests branch protection (#13705)
Signed-off-by: a1012112796 <1012112796@qq.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'routers')
| -rw-r--r-- | routers/api/v1/repo/branch.go | 35 | ||||
| -rw-r--r-- | routers/repo/issue.go | 1 | ||||
| -rw-r--r-- | routers/repo/setting_protected_branch.go | 1 |
3 files changed, 22 insertions, 15 deletions
diff --git a/routers/api/v1/repo/branch.go b/routers/api/v1/repo/branch.go index 2b20ab048d..9a0a552bad 100644 --- a/routers/api/v1/repo/branch.go +++ b/routers/api/v1/repo/branch.go @@ -509,21 +509,22 @@ func CreateBranchProtection(ctx *context.APIContext, form api.CreateBranchProtec } protectBranch = &models.ProtectedBranch{ - RepoID: ctx.Repo.Repository.ID, - BranchName: form.BranchName, - CanPush: form.EnablePush, - EnableWhitelist: form.EnablePush && form.EnablePushWhitelist, - EnableMergeWhitelist: form.EnableMergeWhitelist, - WhitelistDeployKeys: form.EnablePush && form.EnablePushWhitelist && form.PushWhitelistDeployKeys, - EnableStatusCheck: form.EnableStatusCheck, - StatusCheckContexts: form.StatusCheckContexts, - EnableApprovalsWhitelist: form.EnableApprovalsWhitelist, - RequiredApprovals: requiredApprovals, - BlockOnRejectedReviews: form.BlockOnRejectedReviews, - DismissStaleApprovals: form.DismissStaleApprovals, - RequireSignedCommits: form.RequireSignedCommits, - ProtectedFilePatterns: form.ProtectedFilePatterns, - BlockOnOutdatedBranch: form.BlockOnOutdatedBranch, + RepoID: ctx.Repo.Repository.ID, + BranchName: form.BranchName, + CanPush: form.EnablePush, + EnableWhitelist: form.EnablePush && form.EnablePushWhitelist, + EnableMergeWhitelist: form.EnableMergeWhitelist, + WhitelistDeployKeys: form.EnablePush && form.EnablePushWhitelist && form.PushWhitelistDeployKeys, + EnableStatusCheck: form.EnableStatusCheck, + StatusCheckContexts: form.StatusCheckContexts, + EnableApprovalsWhitelist: form.EnableApprovalsWhitelist, + RequiredApprovals: requiredApprovals, + BlockOnRejectedReviews: form.BlockOnRejectedReviews, + BlockOnOfficialReviewRequests: form.BlockOnOfficialReviewRequests, + DismissStaleApprovals: form.DismissStaleApprovals, + RequireSignedCommits: form.RequireSignedCommits, + ProtectedFilePatterns: form.ProtectedFilePatterns, + BlockOnOutdatedBranch: form.BlockOnOutdatedBranch, } err = models.UpdateProtectBranch(ctx.Repo.Repository, protectBranch, models.WhitelistOptions{ @@ -652,6 +653,10 @@ func EditBranchProtection(ctx *context.APIContext, form api.EditBranchProtection protectBranch.BlockOnRejectedReviews = *form.BlockOnRejectedReviews } + if form.BlockOnOfficialReviewRequests != nil { + protectBranch.BlockOnOfficialReviewRequests = *form.BlockOnOfficialReviewRequests + } + if form.DismissStaleApprovals != nil { protectBranch.DismissStaleApprovals = *form.DismissStaleApprovals } diff --git a/routers/repo/issue.go b/routers/repo/issue.go index ded9b3c208..6ebc5d6ecb 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -1455,6 +1455,7 @@ func ViewIssue(ctx *context.Context) { cnt := pull.ProtectedBranch.GetGrantedApprovalsCount(pull) ctx.Data["IsBlockedByApprovals"] = !pull.ProtectedBranch.HasEnoughApprovals(pull) ctx.Data["IsBlockedByRejection"] = pull.ProtectedBranch.MergeBlockedByRejectedReview(pull) + ctx.Data["IsBlockedByOfficialReviewRequests"] = pull.ProtectedBranch.MergeBlockedByOfficialReviewRequests(pull) ctx.Data["IsBlockedByOutdatedBranch"] = pull.ProtectedBranch.MergeBlockedByOutdatedBranch(pull) ctx.Data["GrantedApprovals"] = cnt ctx.Data["RequireSigned"] = pull.ProtectedBranch.RequireSignedCommits diff --git a/routers/repo/setting_protected_branch.go b/routers/repo/setting_protected_branch.go index f864e8a75c..c2e7bc8fac 100644 --- a/routers/repo/setting_protected_branch.go +++ b/routers/repo/setting_protected_branch.go @@ -246,6 +246,7 @@ func SettingsProtectedBranchPost(ctx *context.Context, f auth.ProtectBranchForm) } } protectBranch.BlockOnRejectedReviews = f.BlockOnRejectedReviews + protectBranch.BlockOnOfficialReviewRequests = f.BlockOnOfficialReviewRequests protectBranch.DismissStaleApprovals = f.DismissStaleApprovals protectBranch.RequireSignedCommits = f.RequireSignedCommits protectBranch.ProtectedFilePatterns = f.ProtectedFilePatterns |