summaryrefslogtreecommitdiff
path: root/PROCESS.md
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2016-04-13 12:30:42 +0200
committerYorick Peterse <yorickpeterse@gmail.com>2016-04-18 12:19:58 +0200
commit4b025ba02bb19c72a6872d0c6821fa0b10c58800 (patch)
tree43f80156d1b3c45c94e7be755bb033ac8b33a879 /PROCESS.md
parent6d899f46b577190eade2db9be548dcda271a9023 (diff)
downloadgitlab-ce-4b025ba02bb19c72a6872d0c6821fa0b10c58800.tar.gz
Document the feature freeze of stable branchesdocument-feature-freeze
Fixes gitlab-org/gitlab-ce#15183
Diffstat (limited to 'PROCESS.md')
-rw-r--r--PROCESS.md19
1 files changed, 19 insertions, 0 deletions
diff --git a/PROCESS.md b/PROCESS.md
index cad45d23df9..e34f59c6bce 100644
--- a/PROCESS.md
+++ b/PROCESS.md
@@ -105,6 +105,25 @@ sensitive as to how you word things. Use Emoji to express your feelings (heart,
star, smile, etc.). Some good tips about giving feedback to merge requests is in
the [Thoughtbot code review guide].
+## Feature Freeze
+
+5 working days before the 22nd the stable branches for the upcoming release will
+be frozen for major changes. Merge requests may still be merged into master
+during this period. By freezing the stable branches prior to a release there's
+no need to worry about last minute merge requests potentially breaking a lot of
+things.
+
+What is considered to be a major change is determined on a case by case basis as
+this definition depends very much on the context of changes. For example, a 5
+line change might have a big impact on the entire application. Ultimately the
+decision will be made by those reviewing a merge request and the release
+manager.
+
+During the feature freeze all merge requests that are meant to go into the next
+release should have the correct milestone assigned _and_ have the label
+~"Pick into Stable" set. Merge requests without a milestone and this label will
+not be merged into any stable branches.
+
## Copy & paste responses
### Improperly formatted issue