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 /options | |
| 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 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 7b65de6add..eb38a777c8 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -1334,6 +1334,7 @@ settings.protect_this_branch = Enable Branch Protection settings.protect_this_branch_desc = Prevent deletion and disable any Git pushing to the branch. settings.protect_whitelist_committers = Enable Push Whitelist settings.protect_whitelist_committers_desc = Allow whitelisted users or teams to push to this branch (but not force push). +settings.protect_whitelist_deploy_keys = Whitelist deploy keys with write access to push settings.protect_whitelist_users = Whitelisted users for pushing: settings.protect_whitelist_search_users = Search users… settings.protect_whitelist_teams = Whitelisted teams for pushing: |