diff options
| author | zeripath <art27@cantab.net> | 2020-08-22 21:35:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-22 23:35:56 +0300 |
| commit | a687980412cb30566b68e85d40780efd97e57214 (patch) | |
| tree | 07d90f36d908f0045b20533abf120c175e5b1444 /modules | |
| parent | 1f85815a3b5bf2df380b32818754ae0e183280b0 (diff) | |
| download | gitea-a687980412cb30566b68e85d40780efd97e57214.tar.gz gitea-a687980412cb30566b68e85d40780efd97e57214.zip | |
Default empty merger list to those with write permissions (#12535) (#12560)
Backport #12535
Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/convert/convert.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/modules/convert/convert.go b/modules/convert/convert.go index ec18b13056..94ecdd1150 100644 --- a/modules/convert/convert.go +++ b/modules/convert/convert.go @@ -67,8 +67,12 @@ func ToBranch(repo *models.Repository, b *git.Branch, c *git.Commit, bp *models. } if user != nil { + permission, err := models.GetUserRepoPermission(repo, user) + if err != nil { + return nil, err + } branch.UserCanPush = bp.CanUserPush(user.ID) - branch.UserCanMerge = bp.IsUserMergeWhitelisted(user.ID) + branch.UserCanMerge = bp.IsUserMergeWhitelisted(user.ID, permission) } return branch, nil |