From e4d7aa9baada8353bb847a470b9b12ac30883f16 Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
Date: Mon, 13 Mar 2023 00:28:39 +0300
Subject: [PATCH] gitea: change default settings for pull requests

---
 machines/magenta/services/gitea.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/machines/magenta/services/gitea.nix b/machines/magenta/services/gitea.nix
index 46bcdd8..767eaf8 100644
--- a/machines/magenta/services/gitea.nix
+++ b/machines/magenta/services/gitea.nix
@@ -69,6 +69,8 @@ in
       };
       "repository.pull-request" = {
         WORK_IN_PROGRESS_PREFIXES = "Draft:,[Draft]:,WIP:,[WIP]:";
+        DEFAULT_MERGE_STYLE = "rebase";
+        POPULATE_SQUASH_COMMENT_WITH_COMMIT_MESSAGES = true;
       };
       indexer = {
         ISSUE_INDEXER_PATH = "${giteaCfg.stateDir}/indexers/issues.bleve";