From daf505eaccd751a4ed6d34f42f32cd890ad162a5 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Thu, 22 Oct 2015 15:04:39 -0400 Subject: [PATCH 1/3] Point organization document to issue handling for binding procedure --- doc/source/project/organization.rst | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/doc/source/project/organization.rst b/doc/source/project/organization.rst index 7a946cbb8de..2cf69052d7d 100644 --- a/doc/source/project/organization.rst +++ b/doc/source/project/organization.rst @@ -175,8 +175,23 @@ The Galaxy *committers* group may only commit directly to Galaxy (i.e. outside of a pull request and not following the procedures described here) the following two categories of patches: +Labeling and Milestones +----------------------- + +Pull request handling, labeling, and milestone usage follows the procedures +described in ISSUES_. + +Issue Reporting +=============== + +Issues (bugs, feature requests, etc.) should be reported at ISSUE_REPORT_, and +handling of issues follows the procedures described in ISSUES_. + + * Patches for serious security vulnerabilities. * Cherry-picking and/or merging of existing approved commits to other branches. .. _LICENSE: https://github.com/galaxyproject/galaxy/blob/dev/LICENSE.txt .. _CODE_OF_CONDUCT: https://github.com/galaxyproject/galaxy/blob/dev/CODE_OF_CONDUCT.md +.. _ISSUES: https://github.com/galaxyproject/galaxy/blob/dev/doc/source/project/organization.rst +.. _ISSUE_REPORT: https://github.com/galaxyproject/galaxy/issues/ From bc217b6a278cdb7d5078d24b79db8116e9405239 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Thu, 22 Oct 2015 15:26:12 -0400 Subject: [PATCH 2/3] Place correctly after the last section. --- doc/source/project/organization.rst | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/source/project/organization.rst b/doc/source/project/organization.rst index 2cf69052d7d..12adc20295c 100644 --- a/doc/source/project/organization.rst +++ b/doc/source/project/organization.rst @@ -175,12 +175,16 @@ The Galaxy *committers* group may only commit directly to Galaxy (i.e. outside of a pull request and not following the procedures described here) the following two categories of patches: +* Patches for serious security vulnerabilities. +* Cherry-picking and/or merging of existing approved commits to other branches. + Labeling and Milestones ----------------------- Pull request handling, labeling, and milestone usage follows the procedures described in ISSUES_. + Issue Reporting =============== @@ -188,9 +192,6 @@ Issues (bugs, feature requests, etc.) should be reported at ISSUE_REPORT_, and handling of issues follows the procedures described in ISSUES_. -* Patches for serious security vulnerabilities. -* Cherry-picking and/or merging of existing approved commits to other branches. - .. _LICENSE: https://github.com/galaxyproject/galaxy/blob/dev/LICENSE.txt .. _CODE_OF_CONDUCT: https://github.com/galaxyproject/galaxy/blob/dev/CODE_OF_CONDUCT.md .. _ISSUES: https://github.com/galaxyproject/galaxy/blob/dev/doc/source/project/organization.rst From 9bbb3b97bd32a83303168a839a68070c822d04c4 Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Fri, 23 Oct 2015 09:28:23 -0400 Subject: [PATCH 3/3] Fix link from org to issues. --- doc/source/project/organization.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/project/organization.rst b/doc/source/project/organization.rst index 12adc20295c..dee5985caaa 100644 --- a/doc/source/project/organization.rst +++ b/doc/source/project/organization.rst @@ -194,5 +194,5 @@ handling of issues follows the procedures described in ISSUES_. .. _LICENSE: https://github.com/galaxyproject/galaxy/blob/dev/LICENSE.txt .. _CODE_OF_CONDUCT: https://github.com/galaxyproject/galaxy/blob/dev/CODE_OF_CONDUCT.md -.. _ISSUES: https://github.com/galaxyproject/galaxy/blob/dev/doc/source/project/organization.rst +.. _ISSUES: https://github.com/galaxyproject/galaxy/blob/dev/doc/source/project/issues.rst .. _ISSUE_REPORT: https://github.com/galaxyproject/galaxy/issues/