]> source.dussan.org Git - gitea.git/commit
Add DefaultMergeStyle option to repository (#14789)
authorparnic <github@parnic.com>
Sat, 27 Mar 2021 14:55:40 +0000 (09:55 -0500)
committerGitHub <noreply@github.com>
Sat, 27 Mar 2021 14:55:40 +0000 (15:55 +0100)
commitf4d27498bdc615605e14f783501e1d1256cd8d22
tree8d04695b060bd8bac65b4a0d669628fe220a23e6
parent6b836ac5f7546bc9ffb118b213dba92d3dd9ba8e
Add DefaultMergeStyle option to repository (#14789)

Fixes #12293
models/repo.go
models/repo_unit.go
modules/convert/repository.go
modules/forms/repo_form.go
modules/structs/repo.go
options/locale/locale_en-US.ini
routers/api/v1/repo/repo.go
routers/repo/issue.go
routers/repo/setting.go
templates/repo/settings/options.tmpl
templates/swagger/v1_json.tmpl