Browse Source

Check Push permissions on IsUserAllowedToUpdate (#11448)

tags/v1.13.0-dev
6543 GitHub 5 years ago
parent
commit
73b1425f6e
1 changed files with 11 additions and 0 deletions
  1. +11
    -0
      services/pull/update.go

+ 11
- 0
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)
} }




Loading…
Cancel
Save