From 90e99db635639996e0f030ec05b8e54c06a1f449 Mon Sep 17 00:00:00 2001 From: Thomas Landauer Date: Tue, 12 Jan 2021 13:07:32 +0100 Subject: [PATCH 1/4] Removing outdated information on automatic merge process See https://github.com/symfony/recipes-contrib/issues/1076#issuecomment-758502196 --- README.rst | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/README.rst b/README.rst index 3d36b23f..777ae1ba 100644 --- a/README.rst +++ b/README.rst @@ -19,25 +19,7 @@ For more information about contributing a recipe, read the `documentation`_ on the main repository. Unlike for official recipes, the pull requests for new contrib recipes are -managed by the community. Pull requests are reviewed by the Symfony Bot and -automatically merged when the following conditions are met (in that order): - -* The pull request title does not contain "WIP"; - -* The Symfony Bot approved the pull request and reported no validation errors; - -* Someone (not the Symfony bot nor the pull request author) approved the pull - request; - -* The pull request author or the reviewer is a "trusted user". A "trusted user" - being one of the following: - - * A Symfony Core Merger; - - * The user is the Github owner for all modified packages; - - * The user is a member of the organizations (publicly visible) for all - modified packages. +managed by the community. .. _`Symfony Flex`: https://github.com/symfony/flex .. _`Symfony recipes`: https://github.com/symfony/recipes From b513f073a3db4263744e935dd8dfb1d36100ea7b Mon Sep 17 00:00:00 2001 From: Thomas Landauer Date: Tue, 12 Jan 2021 13:49:56 +0100 Subject: [PATCH 2/4] Update README.rst --- README.rst | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 777ae1ba..6820d4cf 100644 --- a/README.rst +++ b/README.rst @@ -19,7 +19,22 @@ For more information about contributing a recipe, read the `documentation`_ on the main repository. Unlike for official recipes, the pull requests for new contrib recipes are -managed by the community. +managed by the community. Pull requests are reviewed by the Symfony Bot and +automatically merged when the following conditions are met (in that order): + +* The pull request title does not contain "WIP"; + +* The Symfony Bot approved the pull request and reported no validation errors; + +* Someone (not the Symfony bot nor the pull request author) approved the pull + request; + +* The pull request author or the reviewer is a "trusted user". A "trusted user" + being one of the following: + + * A Symfony Core Merger; + + * The user is the Github owner for all modified packages; .. _`Symfony Flex`: https://github.com/symfony/flex .. _`Symfony recipes`: https://github.com/symfony/recipes From a018c0d155067dfde75c8d7cdc677df3c52a14a1 Mon Sep 17 00:00:00 2001 From: Thomas Landauer Date: Tue, 12 Jan 2021 13:54:51 +0100 Subject: [PATCH 3/4] Update README.rst --- README.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.rst b/README.rst index 6820d4cf..cbbe4986 100644 --- a/README.rst +++ b/README.rst @@ -29,12 +29,12 @@ automatically merged when the following conditions are met (in that order): * Someone (not the Symfony bot nor the pull request author) approved the pull request; -* The pull request author or the reviewer is a "trusted user". A "trusted user" - being one of the following: +* The pull request author or the reviewer is a "trusted user", which means + one of the following: - * A Symfony Core Merger; + * a Symfony Core Merger; - * The user is the Github owner for all modified packages; + * the Github owner for all modified packages. .. _`Symfony Flex`: https://github.com/symfony/flex .. _`Symfony recipes`: https://github.com/symfony/recipes From a459d08e0a4064f9bc6222af25ac688087206f75 Mon Sep 17 00:00:00 2001 From: Thomas Landauer Date: Tue, 12 Jan 2021 18:03:51 +0100 Subject: [PATCH 4/4] Update README.rst --- README.rst | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.rst b/README.rst index cbbe4986..ba6fa370 100644 --- a/README.rst +++ b/README.rst @@ -29,12 +29,7 @@ automatically merged when the following conditions are met (in that order): * Someone (not the Symfony bot nor the pull request author) approved the pull request; -* The pull request author or the reviewer is a "trusted user", which means - one of the following: - - * a Symfony Core Merger; - - * the Github owner for all modified packages. +* The pull request author or the reviewer is a Symfony Core Merger. .. _`Symfony Flex`: https://github.com/symfony/flex .. _`Symfony recipes`: https://github.com/symfony/recipes