diff options
| author | a1012112796 <1012112796@qq.com> | 2021-02-12 01:32:25 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-11 18:32:25 +0100 |
| commit | ac701637b42d2d6bb5fe9b258f3f54959b6a505e (patch) | |
| tree | 3020b45f25405036036c7d0cc0a7fc5007b5ab60 /models/branches.go | |
| parent | c69c01d2b6b08a89448b5596fd2233fa4e802ac3 (diff) | |
| download | gitea-ac701637b42d2d6bb5fe9b258f3f54959b6a505e.tar.gz gitea-ac701637b42d2d6bb5fe9b258f3f54959b6a505e.zip | |
Add dismiss review feature (#12674)
* Add dismiss review feature
refs:
https://github.blog/2016-10-12-dismissing-reviews-on-pull-requests/
https://developer.github.com/v3/pulls/reviews/#dismiss-a-review-for-a-pull-request
* change modal ui and error message
* Add unDismissReview api
Signed-off-by: a1012112796 <1012112796@qq.com>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: 6543 <6543@obermui.de>
Diffstat (limited to 'models/branches.go')
| -rw-r--r-- | models/branches.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/models/branches.go b/models/branches.go index 80df8c433e..440c093095 100644 --- a/models/branches.go +++ b/models/branches.go @@ -157,7 +157,8 @@ func (protectBranch *ProtectedBranch) HasEnoughApprovals(pr *PullRequest) bool { func (protectBranch *ProtectedBranch) GetGrantedApprovalsCount(pr *PullRequest) int64 { sess := x.Where("issue_id = ?", pr.IssueID). And("type = ?", ReviewTypeApprove). - And("official = ?", true) + And("official = ?", true). + And("dismissed = ?", false) if protectBranch.DismissStaleApprovals { sess = sess.And("stale = ?", false) } @@ -178,6 +179,7 @@ func (protectBranch *ProtectedBranch) MergeBlockedByRejectedReview(pr *PullReque rejectExist, err := x.Where("issue_id = ?", pr.IssueID). And("type = ?", ReviewTypeReject). And("official = ?", true). + And("dismissed = ?", false). Exist(new(Review)) if err != nil { log.Error("MergeBlockedByRejectedReview: %v", err) |