diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2017-09-14 16:16:22 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-14 16:16:22 +0800 |
| commit | 1739e84ac02c0384c04576a00abab9348293f9c7 (patch) | |
| tree | 1015e68f36421f274d2e883ff3ddb0cb29b6af71 /routers/repo/pull.go | |
| parent | be3319b3d545289b772d7a92b4b62205863954d9 (diff) | |
| download | gitea-1739e84ac02c0384c04576a00abab9348293f9c7.tar.gz gitea-1739e84ac02c0384c04576a00abab9348293f9c7.zip | |
improve protected branch to add whitelist support (#2451)
* improve protected branch to add whitelist support
* fix lint
* fix style check
* fix tests
* fix description on UI and import
* fix test
* bug fixed
* fix tests and languages
* move isSliceInt64Eq to util pkg; improve function names & typo
Diffstat (limited to 'routers/repo/pull.go')
| -rw-r--r-- | routers/repo/pull.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/routers/repo/pull.go b/routers/repo/pull.go index 47fcff3128..87d3bdc26d 100644 --- a/routers/repo/pull.go +++ b/routers/repo/pull.go @@ -841,7 +841,7 @@ func CleanUpPullRequest(ctx *context.Context) { } // Check if branch is not protected - if protected, err := pr.HeadRepo.IsProtectedBranch(pr.HeadBranch); err != nil || protected { + if protected, err := pr.HeadRepo.IsProtectedBranch(pr.HeadBranch, ctx.User); err != nil || protected { if err != nil { log.Error(4, "HeadRepo.IsProtectedBranch: %v", err) } |