summaryrefslogtreecommitdiff
path: root/PROCESS.md
diff options
context:
space:
mode:
authorDouwe Maan <douwe@selenight.nl>2017-02-08 15:42:40 -0600
committerDouwe Maan <douwe@selenight.nl>2017-02-08 16:47:27 -0600
commit6f6100b562b64fbb42f999dfa4eecfc404896aac (patch)
treee2f5966c312b9cc47f72918a8bed7dab1bf41629 /PROCESS.md
parent7fd0934f5aa4badad30e6ce696ac3893987cda2d (diff)
downloadgitlab-ce-6f6100b562b64fbb42f999dfa4eecfc404896aac.tar.gz
Too many releases
Diffstat (limited to 'PROCESS.md')
-rw-r--r--PROCESS.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/PROCESS.md b/PROCESS.md
index 53a6dc4fad9..eaf388be369 100644
--- a/PROCESS.md
+++ b/PROCESS.md
@@ -59,7 +59,7 @@ star, smile, etc.). Some good tips about code reviews can be found in our
## Feature Freeze
-On the 7th of each month, RC1 of the upcoming release is released and the stable branch for this release is frozen, which means master is no longer merged into it.
+On the 7th of each month, RC1 of the upcoming release 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 period,
but they will go into the _next_ release, unless they are manually cherry-picked into the stable branch.
By freezing the stable branches prior to a release there's no need to worry