diff options
| author | SagePtr <sageptr@gmail.com> | 2018-07-27 21:11:53 +0200 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2018-07-27 22:11:53 +0300 |
| commit | 5a7830e0e8376bc6ccdbb31b46db2cf2114a4391 (patch) | |
| tree | 6d2c1deebac25d38b59cd8a1c229afec4458dd40 /models | |
| parent | dae065ea6865205647cd13db9600098b45850672 (diff) | |
| download | gitea-5a7830e0e8376bc6ccdbb31b46db2cf2114a4391.tar.gz gitea-5a7830e0e8376bc6ccdbb31b46db2cf2114a4391.zip | |
Fix incorrect MergeWhitelistTeamIDs check in CanUserMerge function (#4519) (#4526)
Diffstat (limited to 'models')
| -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 } |