m79305216
/
gitea
forked from p85947160/gitea
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix incorrect MergeWhitelistTeamIDs check in CanUserMerge function (#4519) (#4525)

This commit is contained in:
SagePtr 2018-07-27 21:11:24 +02:00 committed by Lauris BH
parent 5927599e43
commit c1224124ea
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/branches.go
View File

@ -74,7 +74,7 @@ func (protectBranch *ProtectedBranch) CanUserMerge(userID int64) bool {
return true
}
if len(protectBranch.WhitelistTeamIDs) == 0 {
if len(protectBranch.MergeWhitelistTeamIDs) == 0 {
return false
}