diff options
| author | David Svantesson <davidsvantesson@gmail.com> | 2020-01-03 18:47:10 +0100 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2020-01-03 19:47:09 +0200 |
| commit | ea707f5a77d83d023cb02ce8e44c4b95ac83ef30 (patch) | |
| tree | fdebe0cc3d2b0e41cf8c7932ae446a2e3c500bbc /templates/repo/settings/protected_branch.tmpl | |
| parent | b39fab41c8b315ba7ddf9f9a4cc522385cf9f720 (diff) | |
| download | gitea-ea707f5a77d83d023cb02ce8e44c4b95ac83ef30.tar.gz gitea-ea707f5a77d83d023cb02ce8e44c4b95ac83ef30.zip | |
Add branch protection option to block merge on requested changes. (#9592)
* Add branch protection option to block merge on requested changes.
* Add migration step
* Fix check to correct negation
* Apply suggestions from code review
Language improvement.
Co-Authored-By: John Olheiser <42128690+jolheiser@users.noreply.github.com>
* Copyright year.
Co-authored-by: John Olheiser <42128690+jolheiser@users.noreply.github.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
Diffstat (limited to 'templates/repo/settings/protected_branch.tmpl')
| -rw-r--r-- | templates/repo/settings/protected_branch.tmpl | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/templates/repo/settings/protected_branch.tmpl b/templates/repo/settings/protected_branch.tmpl index b6305861af..bf74a12330 100644 --- a/templates/repo/settings/protected_branch.tmpl +++ b/templates/repo/settings/protected_branch.tmpl @@ -204,6 +204,13 @@ </div> {{end}} </div> + <div class="field"> + <div class="ui checkbox"> + <input name="block_on_rejected_reviews" type="checkbox" {{if .Branch.BlockOnRejectedReviews}}checked{{end}}> + <label for="block_on_rejected_reviews">{{.i18n.Tr "repo.settings.block_rejected_reviews"}}</label> + <p class="help">{{.i18n.Tr "repo.settings.block_rejected_reviews_desc"}}</p> + </div> + </div> </div> <div class="ui divider"></div> |