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

SagePtr · lafriks · commit c1224124ea02 · 2018-07-27T22:11:24.000+03:00
diff --git 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
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ func (protectBranch *ProtectedBranch) CanUserMerge(userID int64) bool {`
`74`	`74`	`return true`
`75`	`75`	`}`
`76`	`76`
`77`		`- if len(protectBranch.WhitelistTeamIDs) == 0 {`
	`77`	`+ if len(protectBranch.MergeWhitelistTeamIDs) == 0 {`
`78`	`78`	`return false`
`79`	`79`	`}`
`80`	`80`