From 814505df856ef7db4bcbc240515599ffcdeadd63 Mon Sep 17 00:00:00 2001 From: Joongi Kim Date: Fri, 17 Jan 2020 16:50:42 +0900 Subject: [PATCH 1/3] Disable lockbot comments and add notes in the contribution docs --- .github/lock.yml | 10 +--------- docs/contributing.rst | 10 ++++++++++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/lock.yml b/.github/lock.yml index 38d86319a2c..c4596f2bc80 100644 --- a/.github/lock.yml +++ b/.github/lock.yml @@ -18,15 +18,7 @@ exemptLabels: [] lockLabel: outdated # Comment to post before locking. Set to `false` to disable -lockComment: | - This thread has been automatically locked since there has not been - any recent activity after it was closed. Please open a [new issue] for - related bugs. - - If you feel like there's important points made in this discussion, - please include those exceprts into that [new issue]. - - [new issue]: https://github.com/aio-libs/aiohttp/issues/new +lockComment: false # Assign `resolved` as the reason for locking. Set to `false` to disable setLockReason: true diff --git a/docs/contributing.rst b/docs/contributing.rst index b1920173ebd..d280fc8e26a 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -37,6 +37,16 @@ Workflow is pretty straightforward: needed. The Pull Request is automatically squashed into the single commit once the PR is accepted. +.. note:: + + GitHub issue threads are automatically locked when there has not been any + recent activity for one year. Please open a `new issue + `_ for related bugs. + + If you feel like there are important points in the locked discussions, + please include those exceprts into that new issue. + + Preconditions for running aiohttp test suite -------------------------------------------- From 18c792068b0ed7c6ed31e757545193ceb8038e17 Mon Sep 17 00:00:00 2001 From: Joongi Kim Date: Fri, 17 Jan 2020 16:55:56 +0900 Subject: [PATCH 2/3] Minor fix: PR is also locked --- docs/contributing.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/contributing.rst b/docs/contributing.rst index d280fc8e26a..15ac64ac6a7 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -39,8 +39,8 @@ Workflow is pretty straightforward: .. note:: - GitHub issue threads are automatically locked when there has not been any - recent activity for one year. Please open a `new issue + GitHub issue and pull request threads are automatically locked when there has + not been any recent activity for one year. Please open a `new issue `_ for related bugs. If you feel like there are important points in the locked discussions, From 4e55d70f02d9c58824b4ee90328f7a35c8ed805d Mon Sep 17 00:00:00 2001 From: Joongi Kim Date: Fri, 17 Jan 2020 17:00:28 +0900 Subject: [PATCH 3/3] Add changelog --- CHANGES/4504.doc | 1 + 1 file changed, 1 insertion(+) create mode 100644 CHANGES/4504.doc diff --git a/CHANGES/4504.doc b/CHANGES/4504.doc new file mode 100644 index 00000000000..0ce1cd68df4 --- /dev/null +++ b/CHANGES/4504.doc @@ -0,0 +1 @@ +Updated the contribution guide to reflect the automatic thread locking policy.