From c1224124ea02acf51a13e1445224098b614aa9bc Mon Sep 17 00:00:00 2001
From: SagePtr <sageptr@gmail.com>
Date: Fri, 27 Jul 2018 21:11:24 +0200
Subject: [PATCH] Fix incorrect MergeWhitelistTeamIDs check in CanUserMerge
function (#4519) (#4525)
---
models/branches.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/models/branches.go b/models/branches.go
index faa3ba6af8..ade5de8e0e 100644
--- 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
}