diff options
| author | David Svantesson <davidsvantesson@gmail.com> | 2019-12-04 02:08:56 +0100 |
|---|---|---|
| committer | techknowlogick <techknowlogick@gitea.io> | 2019-12-03 20:08:56 -0500 |
| commit | bac4b78e0908c0cb01a3842436950c7bcf793cf9 (patch) | |
| tree | a3c80aebb1ca69bf6e518b881229158dccf4ddd7 /models/pull.go | |
| parent | 6460284085b0b416d61c57d729d47e932ac05efe (diff) | |
| download | gitea-bac4b78e0908c0cb01a3842436950c7bcf793cf9.tar.gz gitea-bac4b78e0908c0cb01a3842436950c7bcf793cf9.zip | |
Branch protection: Possibility to not use whitelist but allow anyone with write access (#9055)
* Possibility to not use whitelist but allow anyone with write access
* fix existing test
* rename migration function
* Try to give a better name for migration step
* Clear settings if higher level setting is not set
* Move official reviews to db instead of counting approvals each time
* migration
* fix
* fix migration
* fix migration
* Remove NOT NULL from EnableWhitelist as migration isn't possible
* Fix migration, reviews are connected to issues.
* Fix SQL query issues in GetReviewersByPullID.
* Simplify function GetReviewersByIssueID
* Handle reviewers that has been deleted
* Ensure reviews for test is in a well defined order
* Only clear and set official reviews when it is an approve or reject.
Diffstat (limited to 'models/pull.go')
| -rw-r--r-- | models/pull.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/models/pull.go b/models/pull.go index 5b18c9ed10..27824c546a 100644 --- a/models/pull.go +++ b/models/pull.go @@ -159,16 +159,20 @@ func (pr *PullRequest) loadIssue(e Engine) (err error) { // LoadProtectedBranch loads the protected branch of the base branch func (pr *PullRequest) LoadProtectedBranch() (err error) { + return pr.loadProtectedBranch(x) +} + +func (pr *PullRequest) loadProtectedBranch(e Engine) (err error) { if pr.BaseRepo == nil { if pr.BaseRepoID == 0 { return nil } - pr.BaseRepo, err = GetRepositoryByID(pr.BaseRepoID) + pr.BaseRepo, err = getRepositoryByID(e, pr.BaseRepoID) if err != nil { return } } - pr.ProtectedBranch, err = GetProtectedBranchBy(pr.BaseRepo.ID, pr.BaseBranch) + pr.ProtectedBranch, err = getProtectedBranchBy(e, pr.BaseRepo.ID, pr.BaseBranch) return } |