summaryrefslogtreecommitdiff
path: root/PROCESS.md
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2018-12-13 16:05:54 +0000
committerMarin Jankovski <marin@gitlab.com>2018-12-13 16:05:54 +0000
commit0988fa3c7fd92bb1476b3c4deb297a5515843ff9 (patch)
tree10ef21ee82970b88801c3edc6881e69525b952ee /PROCESS.md
parentb5dbfbbac90d067c51f9d2bb80fa5b368ae21548 (diff)
downloadgitlab-ce-0988fa3c7fd92bb1476b3c4deb297a5515843ff9.tar.gz
Green pipeline for feature freeze PROCESS
Diffstat (limited to 'PROCESS.md')
-rw-r--r--PROCESS.md10
1 files changed, 7 insertions, 3 deletions
diff --git a/PROCESS.md b/PROCESS.md
index aadd6a321f0..8859b6b7212 100644
--- a/PROCESS.md
+++ b/PROCESS.md
@@ -75,9 +75,13 @@ star, smile, etc.). Some good tips about code reviews can be found in our
## Feature freeze on the 7th for the release on the 22nd
After 7th at 23:59 (Pacific Time Zone) of each month, RC1 of the upcoming
-release (to be shipped on the 22nd) is created and deployed to GitLab.com and
-the stable branch for this release is frozen, which means master is no longer
-merged into it. Merge requests may still be merged into master during this
+release (to be shipped on the 22nd) is created and deployed to GitLab.com.
+The stable branch for this release is frozen, which means master is no longer
+merged into it. Release managers can decide to include the last known green
+pipeline as a last item going to a stable branch, regardless of whether
+the feature freeze time has passed.
+
+Merge requests may still be merged into master during this
period, but they will go into the _next_ release, unless they are manually
cherry-picked into the stable branch.