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

Fix admin handling at merge of PR (#9749)

Browse Source 
* Admin shall be able to bypass merge checks.

* Repository admin should not bypass if merge whitelist is set.

* Add code comment about checks that PR are ready

* notAllOverrideableChecksOk->notAllOverridableChecksOk

* Fix merge, require signed currently not overridable.

* fix

Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
This commit is contained in:
David SvantessonandAntoine GIRARD authored and Lauris BH committed 2020-01-16 23:01:22 +02:00
1 parent d3468ed79f
commit 18e0447b3f
3 files changed
+18 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

services/pull/merge.go
-3
View File
@@ -487,9 +487,6 @@ func IsSignedIfRequired(pr *models.PullRequest, doer *models.User) (bool, error)
// IsUserAllowedToMerge check if user is allowed to merge PR with given permissions and branch protections
func IsUserAllowedToMerge(pr *models.PullRequest, p models.Permission, user *models.User) (bool, error) {
if p.IsAdmin() {
return true, nil
}
if !p.CanWrite(models.UnitTypeCode) {
return false, nil
}