From 85a743cb807a7b377f039511114c3f263c4e7f3b Mon Sep 17 00:00:00 2001 From: Artem Goncharov Date: Tue, 3 Jan 2023 10:04:45 +0100 Subject: [PATCH] update gitcontrol repo template --- tools-requirements.txt | 4 +++- tools/generate_doc_gitcontrol_repos.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools-requirements.txt b/tools-requirements.txt index ebc313b1..b82f11a5 100644 --- a/tools-requirements.txt +++ b/tools-requirements.txt @@ -1,2 +1,4 @@ GitPython -ruamel +ruamel.yaml +requests +jinja2 diff --git a/tools/generate_doc_gitcontrol_repos.py b/tools/generate_doc_gitcontrol_repos.py index 16bdfe6d..bcb63a76 100644 --- a/tools/generate_doc_gitcontrol_repos.py +++ b/tools/generate_doc_gitcontrol_repos.py @@ -46,7 +46,7 @@ def process_services(args, services): has_wiki=False, default_delete_branch_after_merge=True, allow_merge_commit=False, - allow_squash_merge=False, + allow_squash_merge=True, allow_rebase_merge=False, default_merge_style="squash", branch_protections=[], -- 2.34.1