From bb2c5ac70638543e85436442bd3ce2d7cbcb5ca2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 31 Dec 2024 00:28:21 +0000
Subject: [PATCH] chore(deps): update base digest to 25dfb83 (#87)

* chore(deps): update base digest to 25dfb83

* feat(settings): set `allow_squash_merge` to `false`

* test: approve new changes

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Dafydd Jones <dafydd@techneg.it>
---
 base                                         | 2 +-
 template/.github/settings.yml                | 1 +
 template/template/.github/settings.yml       | 6 ++++++
 template/test/GenerateProject/catalogue.tt   | 1 +
 test/GenerateProject/catalogue.tt            | 2 ++
 test/GenerateProjectWithName/catalogue.tt    | 2 ++
 test/GenerateProjectWithName/catalogue_tt.tt | 1 +
 7 files changed, 14 insertions(+), 1 deletion(-)
 create mode 120000 template/.github/settings.yml
 create mode 100644 template/template/.github/settings.yml

diff --git a/base b/base
index fbb338c..25dfb83 160000
--- a/base
+++ b/base
@@ -1 +1 @@
-Subproject commit fbb338ca6435f94e70501565709167c33939da41
+Subproject commit 25dfb83228ad53cf3b002c19e4ecab9eec4bce91
diff --git a/template/.github/settings.yml b/template/.github/settings.yml
new file mode 120000
index 0000000..1d09f2f
--- /dev/null
+++ b/template/.github/settings.yml
@@ -0,0 +1 @@
+../template/.github/settings.yml
\ No newline at end of file
diff --git a/template/template/.github/settings.yml b/template/template/.github/settings.yml
new file mode 100644
index 0000000..9972504
--- /dev/null
+++ b/template/template/.github/settings.yml
@@ -0,0 +1,6 @@
+# These settings are synced to GitHub by https://probot.github.io/apps/settings/
+
+repository:
+  # See https://docs.github.com/en/rest/reference/repos#update-a-repository for all available settings.
+
+  allow_squash_merge: false
diff --git a/template/test/GenerateProject/catalogue.tt b/template/test/GenerateProject/catalogue.tt
index b40f0db..53798bc 100644
--- a/template/test/GenerateProject/catalogue.tt
+++ b/template/test/GenerateProject/catalogue.tt
@@ -3,3 +3,4 @@ The following new files/directories were created:
 ----.copier-answers.yml
 ----.github
 --------renovate.json5
+--------settings.yml
diff --git a/test/GenerateProject/catalogue.tt b/test/GenerateProject/catalogue.tt
index a21dc65..d50a28a 100644
--- a/test/GenerateProject/catalogue.tt
+++ b/test/GenerateProject/catalogue.tt
@@ -3,6 +3,7 @@ The following new files/directories were created:
 ----.copier-answers.yml
 ----.github
 --------renovate.json5
+--------settings.yml
 --------workflows
 ------------main.yml
 ----.pre-commit-config.yaml
@@ -13,6 +14,7 @@ The following new files/directories were created:
 --------{{ _copier_conf.answers_file }}.copier-jinja
 --------.github
 ------------renovate.json5
+------------settings.yml
 ----test
 --------config.tt
 --------options.tt
diff --git a/test/GenerateProjectWithName/catalogue.tt b/test/GenerateProjectWithName/catalogue.tt
index a21dc65..d50a28a 100644
--- a/test/GenerateProjectWithName/catalogue.tt
+++ b/test/GenerateProjectWithName/catalogue.tt
@@ -3,6 +3,7 @@ The following new files/directories were created:
 ----.copier-answers.yml
 ----.github
 --------renovate.json5
+--------settings.yml
 --------workflows
 ------------main.yml
 ----.pre-commit-config.yaml
@@ -13,6 +14,7 @@ The following new files/directories were created:
 --------{{ _copier_conf.answers_file }}.copier-jinja
 --------.github
 ------------renovate.json5
+------------settings.yml
 ----test
 --------config.tt
 --------options.tt
diff --git a/test/GenerateProjectWithName/catalogue_tt.tt b/test/GenerateProjectWithName/catalogue_tt.tt
index b40f0db..53798bc 100644
--- a/test/GenerateProjectWithName/catalogue_tt.tt
+++ b/test/GenerateProjectWithName/catalogue_tt.tt
@@ -3,3 +3,4 @@ The following new files/directories were created:
 ----.copier-answers.yml
 ----.github
 --------renovate.json5
+--------settings.yml