git724/forgejo
1
0
Fork 0
Code Issues Pull requests 3 Projects 1 Releases Packages Wiki Activity

Check Push permissions on IsUserAllowedToUpdate (#11448)

Browse source
This commit is contained in:
6543 2020-05-17 02:48:30 +02:00 • committed by GitHub
commit 84bcb3451a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
services/pull/update.go
View file

@ -59,6 +59,17 @@ func IsUserAllowedToUpdate(pull *models.PullRequest, user *models.User) (bool, e
HeadBranch: pull.BaseBranch, HeadBranch: pull.BaseBranch,
BaseBranch: pull.HeadBranch, BaseBranch: pull.HeadBranch,
} }
err = pr.LoadProtectedBranch()
if err != nil {
return false, err
}
// Update function need push permission
if pr.ProtectedBranch != nil && !pr.ProtectedBranch.CanUserPush(user.ID) {
return false, nil
}
return IsUserAllowedToMerge(pr, headRepoPerm, user) return IsUserAllowedToMerge(pr, headRepoPerm, user)
} }