diff options
| author | SagePtr <sageptr@gmail.com> | 2018-07-27 21:11:24 +0200 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2018-07-27 22:11:24 +0300 |
| commit | c1224124ea02acf51a13e1445224098b614aa9bc (patch) | |
| tree | bcef8715e4e257788893ee404e5d86a5d2ae089e | |
| parent | 5927599e43304476f62c889925d5d8a551a52991 (diff) | |
| download | gitea-c1224124ea02acf51a13e1445224098b614aa9bc.tar.gz gitea-c1224124ea02acf51a13e1445224098b614aa9bc.zip | |
Fix incorrect MergeWhitelistTeamIDs check in CanUserMerge function (#4519) (#4525)
| -rw-r--r-- | models/branches.go | 2 |
1 files changed, 1 insertions, 1 deletions
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 } |