diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2019-09-18 13:39:45 +0800 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2019-09-18 08:39:45 +0300 |
| commit | 04ca7f004710de2b408f558f6f148894aa61ba57 (patch) | |
| tree | 57fea3b9853127897676faaf9e70abace2565878 /models/branches.go | |
| parent | 29454733b4eeea33e6c94c50b32855066c203988 (diff) | |
| download | gitea-04ca7f004710de2b408f558f6f148894aa61ba57.tar.gz gitea-04ca7f004710de2b408f558f6f148894aa61ba57.zip | |
Refuse merge until all required status checks success (#7481)
* refuse merge until ci successfully
* deny merge request when required status checkes not succeed on merge Post and API
* add database migration for added columns on protected_branch
* fix migration
* fix protected branch check bug
* fix protected branch settings
* remove duplicated code on check pull request's required commit statuses pass
* remove unused codes
* fix migration
* add newline for template file
* fix go mod
* rename function name and some other fixes
* fix template
* fix bug pull view
* remove go1.12 wrong dependencies
* add administrator bypass when protected branch status check enabled
* fix bug
* improve the codes
Diffstat (limited to 'models/branches.go')
| -rw-r--r-- | models/branches.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/models/branches.go b/models/branches.go index 2a99d98955..9daaa487e7 100644 --- a/models/branches.go +++ b/models/branches.go @@ -36,6 +36,8 @@ type ProtectedBranch struct { EnableMergeWhitelist bool `xorm:"NOT NULL DEFAULT false"` MergeWhitelistUserIDs []int64 `xorm:"JSON TEXT"` MergeWhitelistTeamIDs []int64 `xorm:"JSON TEXT"` + EnableStatusCheck bool `xorm:"NOT NULL DEFAULT false"` + StatusCheckContexts []string `xorm:"JSON TEXT"` ApprovalsWhitelistUserIDs []int64 `xorm:"JSON TEXT"` ApprovalsWhitelistTeamIDs []int64 `xorm:"JSON TEXT"` RequiredApprovals int64 `xorm:"NOT NULL DEFAULT 0"` |