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

6 years ago · c1224124ea
parent 5927599e43
commit c1224124ea
1 changed files with 1 additions and 1 deletions
--- a/models/branches.go
+++ b/models/branches.go
@ -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
 	}