From 63b1fd7c3f80bc76f9208576c1f84cb13ece1fe3 Mon Sep 17 00:00:00 2001 From: BoYanZh Date: Thu, 21 Oct 2021 12:54:53 +0800 Subject: [PATCH] fix: merge whitelist --- README.md | 6 ++++++ joint_teapot/workers/gitea.py | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index eeb21d5..d8aa139 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ A handy tool for TAs in JI to handle works through [Gitea](https://focs.ji.sjtu.edu.cn/git/), [Canvas](https://umjicanvas.com/), and [JOJ](https://joj.sjtu.edu.cn/). Joint is related to JI and also this tool which join websites together. Teapot means to hold Gitea, inspired by [@nichujie](https://github.com/nichujie). +This tool is still under heavy development. The docs may not be updated on time, and all the features are provided with the probability to change. + ## Getting Started ### Setup venv (Optional) @@ -36,3 +38,7 @@ pytest -svv - [x] create repos - [x] archive all repos of a course - [x] check whether an issue exists with appointed title + +## License + +MIT diff --git a/joint_teapot/workers/gitea.py b/joint_teapot/workers/gitea.py index 959765c..9cf2762 100644 --- a/joint_teapot/workers/gitea.py +++ b/joint_teapot/workers/gitea.py @@ -231,11 +231,11 @@ class Gitea: "branch_name": "master", "dismiss_stale_approvals": True, "enable_approvals_whitelist": False, - "enable_merge_whitelist": True, + "enable_merge_whitelist": False, "enable_push": True, "enable_push_whitelist": True, "enable_status_check": False, - "merge_whitelist_teams": ["Owners"], + "merge_whitelist_teams": [], "merge_whitelist_usernames": [], "protected_file_patterns": "", "push_whitelist_deploy_keys": False,