diff options
author | zeripath <art27@cantab.net> | 2019-10-21 09:21:45 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-21 09:21:45 +0100 |
commit | 0bfe5eb10b1953cb1f85f7a7b6eb5f24724b8021 (patch) | |
tree | 8844040cf40b0f37c9457eade166a8bff1a91152 /models/branches.go | |
parent | b1c1e1549b50bbd5929e2c4dd72a1dbf4b511b50 (diff) | |
download | gitea-0bfe5eb10b1953cb1f85f7a7b6eb5f24724b8021.tar.gz gitea-0bfe5eb10b1953cb1f85f7a7b6eb5f24724b8021.zip |
Allow Protected Branches to Whitelist Deploy Keys (#8483)
Add an option to protected branches to add writing deploy keys to the whitelist for pushing.
Please note this is technically a breaking change: previously if the owner of a repository was on the whitelist then any writing deploy key was effectively on the whitelist. This option will now need to be set if that is desired.
Closes #8472
Details:
* Allow Protected Branches to Whitelist Deploy Keys
* Add migration
* Ensure that IsDeployKey is set to false on the http pushes
* add not null default false
Diffstat (limited to 'models/branches.go')
-rw-r--r-- | models/branches.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/models/branches.go b/models/branches.go index fa8beb866c..c5f227f1e5 100644 --- a/models/branches.go +++ b/models/branches.go @@ -34,6 +34,7 @@ type ProtectedBranch struct { WhitelistUserIDs []int64 `xorm:"JSON TEXT"` WhitelistTeamIDs []int64 `xorm:"JSON TEXT"` EnableMergeWhitelist bool `xorm:"NOT NULL DEFAULT false"` + WhitelistDeployKeys bool `xorm:"NOT NULL DEFAULT false"` MergeWhitelistUserIDs []int64 `xorm:"JSON TEXT"` MergeWhitelistTeamIDs []int64 `xorm:"JSON TEXT"` EnableStatusCheck bool `xorm:"NOT NULL DEFAULT false"` |