From a582a887c4e447d1f7bfa7cd8cef06e9485173f1 Mon Sep 17 00:00:00 2001 From: Sage Pointer Date: Fri, 27 Jul 2018 18:41:05 +0200 Subject: [PATCH] Fix incorrect MergeWhitelistTeamIDs check in CanUserMerge function (#4519) --- models/branches.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/branches.go b/models/branches.go index faa3ba6af8551..ade5de8e0e936 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 }