diff options
author | ttys3 <41882455+ttys3@users.noreply.github.com> | 2022-06-03 11:45:54 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-02 23:45:54 -0400 |
commit | 0c759fd4dee1c2a82ecdb0a6019d8ee78dae2209 (patch) | |
tree | 54ceb9a1bf1e750188f8cce9380e0f6a7898217e /routers/install | |
parent | 808a7803098bd86c83185cb823c5b0e2a5b2c56d (diff) | |
download | gitea-0c759fd4dee1c2a82ecdb0a6019d8ee78dae2209.tar.gz gitea-0c759fd4dee1c2a82ecdb0a6019d8ee78dae2209.zip |
feat: add DEFAULT_MERGE_STYLE to `repository.pull-request` section for repo init (#19751)
Diffstat (limited to 'routers/install')
-rw-r--r-- | routers/install/install.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/routers/install/install.go b/routers/install/install.go index 3fc5f0536a..bf95cae1c6 100644 --- a/routers/install/install.go +++ b/routers/install/install.go @@ -456,6 +456,8 @@ func SubmitInstall(ctx *context.Context) { cfg.Section("log").Key("ROOT_PATH").SetValue(form.LogRootPath) cfg.Section("log").Key("ROUTER").SetValue("console") + cfg.Section("repository.pull-request").Key("DEFAULT_MERGE_STYLE").SetValue("merge") + cfg.Section("repository.signing").Key("DEFAULT_TRUST_MODEL").SetValue("committer") cfg.Section("security").Key("INSTALL_LOCK").SetValue("true") |