summaryrefslogtreecommitdiff
path: root/PROCESS.md
diff options
context:
space:
mode:
authorMarin Jankovski <marin@gitlab.com>2018-12-14 06:03:33 +0000
committerMarin Jankovski <marin@gitlab.com>2018-12-14 06:03:33 +0000
commitaedce9e9ba71f3c9c190556183202fa675ce1be7 (patch)
treec87d86f73b9b394a2496539da5d62800146a0596 /PROCESS.md
parent0988fa3c7fd92bb1476b3c4deb297a5515843ff9 (diff)
downloadgitlab-ce-aedce9e9ba71f3c9c190556183202fa675ce1be7.tar.gz
Change the wording on branch feature freezemj/process-feature-freeze
Diffstat (limited to 'PROCESS.md')
-rw-r--r--PROCESS.md11
1 files changed, 5 insertions, 6 deletions
diff --git a/PROCESS.md b/PROCESS.md
index 8859b6b7212..9881331eead 100644
--- a/PROCESS.md
+++ b/PROCESS.md
@@ -74,12 +74,11 @@ 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.
-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.
+After 7th at 23:59 (Pacific Time Zone) of each month, stable branch and RC1
+of the upcoming release (to be shipped on the 22nd) is created and deployed to GitLab.com.
+The stable branch is frozen at the most recent "qualifying commit" on master.
+A "qualifying commit" is one that is pushed before the feature freeze cutoff time
+and that passes all CI jobs (green pipeline).
Merge requests may still be merged into master during this
period, but they will go into the _next_ release, unless they are manually