summaryrefslogtreecommitdiff
path: root/PROCESS.md
diff options
context:
space:
mode:
authorJames Edwards-Jones <jedwardsjones@gitlab.com>2017-08-10 17:54:45 +0100
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-08-10 17:54:45 +0100
commite70c4e44327ad7b2067a10955e9d3c1375a22910 (patch)
tree83c78379985aa502fc6fc780bb79ea9bdea582d1 /PROCESS.md
parent4c7ada21c0502879ae8700225723043df864c490 (diff)
downloadgitlab-ce-e70c4e44327ad7b2067a10955e9d3c1375a22910.tar.gz
Document "Pick into Backports" label processjej/document-pick-into-backports
Diffstat (limited to 'PROCESS.md')
-rw-r--r--PROCESS.md16
1 files changed, 10 insertions, 6 deletions
diff --git a/PROCESS.md b/PROCESS.md
index e5b17784d20..538e4389e00 100644
--- a/PROCESS.md
+++ b/PROCESS.md
@@ -141,18 +141,22 @@ the stable branch are:
* Fixes for security issues
* New or updated translations (as long as they do not touch application code)
-Any merge requests cherry-picked into the stable branch for a previous release
-will also be picked into the latest stable branch. These fixes will be shipped
-in the next RC for that release if it is before the 22nd. If the fixes are are
-completed on or after the 22nd, they will be shipped in a patch for that
-release.
-
During the feature freeze all merge requests that are meant to go into the upcoming
release should have the correct milestone assigned _and_ have the label
~"Pick into Stable" set, so that release managers can find and pick them.
Merge requests without a milestone and this label will
not be merged into any stable branches.
+Fixes marked like this will be shipped in the next RC for that release. Once
+the final RC has been prepared ready for release on the 22nd, further fixes
+marked ~"Pick into Stable" will go into a patch for that release.
+
+If a merge request is to be picked into more than one release it will also need
+the ~"Pick into Backports" label set to remind the release manager to change
+the milestone after cherry-picking. As before, it should still have the
+~"Pick into Stable" label and the milestone of the highest release it will be
+picked into.
+
### Asking for an exception
If you think a merge request should go into an RC or patch even though it does not meet these requirements,