]> source.dussan.org Git - gitea.git/commit
Pull Requests: setting to allow edits by maintainers by default, tweak UI (#22862)
authorBrecht Van Lommel <brecht@blender.org>
Mon, 13 Feb 2023 06:09:52 +0000 (07:09 +0100)
committerGitHub <noreply@github.com>
Mon, 13 Feb 2023 06:09:52 +0000 (14:09 +0800)
commit49919c636e4788a14f3762a0d9137ee2e0092790
treeacac92af0eff851eaea32416e17001ba0776032c
parentb6d77229cfbab146da6445467acab2125e9e5edb
Pull Requests: setting to allow edits by maintainers by default, tweak UI (#22862)

Add setting to allow edits by maintainers by default, to avoid having to
often ask contributors to enable this.

This also reorganizes the pull request settings UI to improve clarity.
It was unclear which checkbox options were there to control available
merge styles and which merge styles they correspond to.

Now there is a "Merge Styles" label followed by the merge style options
with the same name as in other menus. The remaining checkboxes were
moved to the bottom, ordered rougly by typical order of operations.

---------

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
models/repo/repo_unit.go
modules/structs/repo.go
options/locale/locale_en-US.ini
routers/api/v1/repo/repo.go
routers/web/repo/compare.go
routers/web/repo/setting.go
services/convert/repository.go
services/forms/repo_form.go
templates/repo/issue/new_form.tmpl
templates/repo/settings/options.tmpl
templates/swagger/v1_json.tmpl