diff options
| author | Jonas Franz <info@jonasfranz.software> | 2018-12-11 12:28:37 +0100 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2018-12-11 19:28:37 +0800 |
| commit | 9681c8373426e8364760f033b9935b81b9276351 (patch) | |
| tree | d9308c33809fdfa7859fd9a1057432a74a28c92f /routers/repo/issue.go | |
| parent | 64680b72bd1b0a0fc164296ff0cc7319ae7dc4ca (diff) | |
| download | gitea-9681c8373426e8364760f033b9935b81b9276351.tar.gz gitea-9681c8373426e8364760f033b9935b81b9276351.zip | |
Approvals at Branch Protection (#5350)
* Add branch protection for approvals
Signed-off-by: Jonas Franz <info@jonasfranz.software>
* Add required approvals
Signed-off-by: Jonas Franz <info@jonasfranz.software>
* Add missing comments and fmt
Signed-off-by: Jonas Franz <info@jonasfranz.software>
* Add type = approval and group by reviewer_id to review
* Prevent users from adding negative review limits
* Add migration for approval whitelists
Signed-off-by: Jonas Franz <info@jonasfranz.software>
Diffstat (limited to 'routers/repo/issue.go')
| -rw-r--r-- | routers/repo/issue.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 34a01617e4..dd1c5cfa56 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -828,6 +828,14 @@ func ViewIssue(ctx *context.Context) { ctx.Data["MergeStyle"] = "" } } + if err = pull.LoadProtectedBranch(); err != nil { + ctx.ServerError("LoadProtectedBranch", err) + return + } + if pull.ProtectedBranch != nil { + ctx.Data["IsBlockedByApprovals"] = !pull.ProtectedBranch.HasEnoughApprovals(pull) + ctx.Data["GrantedApprovals"] = pull.ProtectedBranch.GetGrantedApprovalsCount(pull) + } ctx.Data["IsPullBranchDeletable"] = canDelete && pull.HeadRepo != nil && git.IsBranchExist(pull.HeadRepo.RepoPath(), pull.HeadBranch) ctx.Data["PullReviewersWithType"], err = models.GetReviewersByPullID(issue.ID) |