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 /templates/repo/settings | |
| 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 'templates/repo/settings')
| -rw-r--r-- | templates/repo/settings/protected_branch.tmpl | 57 |
1 files changed, 39 insertions, 18 deletions
diff --git a/templates/repo/settings/protected_branch.tmpl b/templates/repo/settings/protected_branch.tmpl index 4b401b5131..b6305861af 100644 --- a/templates/repo/settings/protected_branch.tmpl +++ b/templates/repo/settings/protected_branch.tmpl @@ -19,8 +19,22 @@ </div> <div id="protection_box" class="fields {{if not .Branch.IsProtected}}disabled{{end}}"> <div class="field"> - <div class="ui checkbox"> - <input class="enable-whitelist" name="enable_whitelist" type="checkbox" data-target="#whitelist_box" {{if .Branch.EnableWhitelist}}checked{{end}}> + <div class="ui radio checkbox"> + <input name="enable_push" type="radio" value="none" class="disable-whitelist" data-target="#whitelist_box" {{if not .Branch.CanPush}}checked{{end}}> + <label>{{.i18n.Tr "repo.settings.protect_disable_push"}}</label> + <p class="help">{{.i18n.Tr "repo.settings.protect_disable_push_desc"}}</p> + </div> + </div> + <div class="field"> + <div class="ui radio checkbox"> + <input name="enable_push" type="radio" value="all" class="disable-whitelist" data-target="#whitelist_box" {{if and (.Branch.CanPush) (not .Branch.EnableWhitelist)}}checked{{end}}> + <label>{{.i18n.Tr "repo.settings.protect_enable_push"}}</label> + <p class="help">{{.i18n.Tr "repo.settings.protect_enable_push_desc"}}</p> + </div> + </div> + <div class="field"> + <div class="ui radio checkbox"> + <input name="enable_push" type="radio" value="whitelist" class="enable-whitelist" data-target="#whitelist_box" {{if and (.Branch.CanPush) (.Branch.EnableWhitelist)}}checked{{end}}> <label>{{.i18n.Tr "repo.settings.protect_whitelist_committers"}}</label> <p class="help">{{.i18n.Tr "repo.settings.protect_whitelist_committers_desc"}}</p> </div> @@ -148,7 +162,14 @@ <input name="required_approvals" id="required-approvals" type="number" value="{{.Branch.RequiredApprovals}}"> <p class="help">{{.i18n.Tr "repo.settings.protect_required_approvals_desc"}}</p> </div> - <div class="fields"> + <div class="field"> + <div class="ui checkbox"> + <input class="enable-whitelist" name="enable_approvals_whitelist" type="checkbox" data-target="#approvals_whitelist_box" {{if .Branch.EnableApprovalsWhitelist}}checked{{end}}> + <label>{{.i18n.Tr "repo.settings.protect_approvals_whitelist_enabled"}}</label> + <p class="help">{{.i18n.Tr "repo.settings.protect_approvals_whitelist_enabled_desc"}}</p> + </div> + </div> + <div id="approvals_whitelist_box" class="fields {{if not .Branch.EnableApprovalsWhitelist}}disabled{{end}}"> <div class="whitelist field"> <label>{{.i18n.Tr "repo.settings.protect_approvals_whitelist_users"}}</label> <div class="ui multiple search selection dropdown"> @@ -164,24 +185,24 @@ </div> </div> </div> - {{if .Owner.IsOrganization}} - <br> - <div class="whitelist field"> - <label>{{.i18n.Tr "repo.settings.protect_approvals_whitelist_teams"}}</label> - <div class="ui multiple search selection dropdown"> - <input type="hidden" name="approvals_whitelist_teams" value="{{.approvals_whitelist_teams}}"> - <div class="default text">{{.i18n.Tr "repo.settings.protect_whitelist_search_teams"}}</div> - <div class="menu"> - {{range .Teams}} - <div class="item" data-value="{{.ID}}"> - <i class="octicon octicon-jersey"></i> - {{.Name}} + {{if .Owner.IsOrganization}} + <br> + <div class="whitelist field"> + <label>{{.i18n.Tr "repo.settings.protect_approvals_whitelist_teams"}}</label> + <div class="ui multiple search selection dropdown"> + <input type="hidden" name="approvals_whitelist_teams" value="{{.approvals_whitelist_teams}}"> + <div class="default text">{{.i18n.Tr "repo.settings.protect_whitelist_search_teams"}}</div> + <div class="menu"> + {{range .Teams}} + <div class="item" data-value="{{.ID}}"> + <i class="octicon octicon-jersey"></i> + {{.Name}} + </div> + {{end}} </div> - {{end}} </div> </div> - </div> - {{end}} + {{end}} </div> </div> |