From 83bef167dd2e0d364f7653c6697880e83a710af3 Mon Sep 17 00:00:00 2001 From: Fabio Busatto Date: Mon, 5 Mar 2018 14:33:21 +0000 Subject: Update CONTRIBUTING.md --- CONTRIBUTING.md | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 76ee6265c5c..bb2dacf1205 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -26,7 +26,7 @@ _This notice should stay as the first item in the CONTRIBUTING.md file._ - [Type labels (~"feature proposal", ~bug, ~customer, etc.)](#type-labels-feature-proposal-bug-customer-etc) - [Subject labels (~wiki, ~"container registry", ~ldap, ~api, etc.)](#subject-labels-wiki-container-registry-ldap-api-etc) - [Team labels (~"CI/CD", ~Discussion, ~Edge, ~Platform, etc.)](#team-labels-cicd-discussion-edge-platform-etc) - - [Priority labels (~Deliverable and ~Stretch)](#priority-labels-deliverable-and-stretch) + - [Priority labels (~Deliverable, ~Stretch, ~"Next Patch Release")](#priority-labels-deliverable-stretch-next-patch-release) - [Label for community contributors (~"Accepting Merge Requests")](#label-for-community-contributors-accepting-merge-requests) - [Implement design & UI elements](#implement-design-ui-elements) - [Issue tracker](#issue-tracker) @@ -126,7 +126,7 @@ Most issues will have labels for at least one of the following: - Type: ~"feature proposal", ~bug, ~customer, etc. - Subject: ~wiki, ~"container registry", ~ldap, ~api, ~frontend, etc. - Team: ~"CI/CD", ~Discussion, ~Edge, ~Platform, etc. -- Priority: ~Deliverable, ~Stretch +- Priority: ~Deliverable, ~Stretch, ~"Next Patch Release" All labels, their meaning and priority are defined on the [labels page][labels-page]. @@ -185,7 +185,7 @@ indicate if an issue needs backend work, frontend work, or both. Team labels are always capitalized so that they show up as the first label for any issue. -### Priority labels (~Deliverable and ~Stretch) +### Priority labels (~Deliverable, ~Stretch, ~"Next Patch Release") Priority labels help us clearly communicate expectations of the work for the release. There are two levels of priority labels: @@ -195,6 +195,13 @@ release. There are two levels of priority labels: - ~Stretch: Issues that are a stretch goal for delivering in the current milestone. If these issues are not done in the current release, they will strongly be considered for the next release. +- ~"Next Patch Release": Issues to put in the next patch release. Work on these + first, and add the "Pick Into X" label to the merge request, along with the + appropriate milestone. + +Each issue scheduled for the current milestone should be labeled ~Deliverable +or ~"Stretch". Any open issue for a previous milestone should be labeled +~"Next Patch Release", or otherwise rescheduled to a different milestone. ### Severity labels (~S1, ~S2, etc.) @@ -685,4 +692,4 @@ available at [http://contributor-covenant.org/version/1/1/0/](http://contributor [us-english]: https://en.wikipedia.org/wiki/American_English [^1]: Please note that specs other than JavaScript specs are considered backend - code. + code. \ No newline at end of file -- cgit v1.2.1 From d6d202d718e785d08bb5101ef7129a03dfa864c0 Mon Sep 17 00:00:00 2001 From: Fabio Busatto Date: Mon, 5 Mar 2018 14:35:21 +0000 Subject: Update CONTRIBUTING.md --- CONTRIBUTING.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index bb2dacf1205..d75a0690307 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -692,4 +692,5 @@ available at [http://contributor-covenant.org/version/1/1/0/](http://contributor [us-english]: https://en.wikipedia.org/wiki/American_English [^1]: Please note that specs other than JavaScript specs are considered backend - code. \ No newline at end of file + code. + \ No newline at end of file -- cgit v1.2.1