summaryrefslogtreecommitdiff
path: root/PROCESS.md
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2017-08-09 10:04:19 +0100
committerSean McGivern <sean@gitlab.com>2017-08-09 10:09:01 +0100
commit02e9abc807e77cca8f85588db81e939d402a0d98 (patch)
tree3fbb3f89ca679c35d1fe02fbd17593f040ddd234 /PROCESS.md
parent932a6e69b882334dd7e8fdf158ebbab4c620a2b5 (diff)
downloadgitlab-ce-02e9abc807e77cca8f85588db81e939d402a0d98.tar.gz
Ask for exceptions in advance
If a feature is really really really really important (most aren't), but we aren't confident that it is ready on the 7th, people can ask for an exception to the freeze process in advance, and it will be picked once it's merged.
Diffstat (limited to 'PROCESS.md')
-rw-r--r--PROCESS.md20
1 files changed, 15 insertions, 5 deletions
diff --git a/PROCESS.md b/PROCESS.md
index 2b3d142bf77..1669e1fa899 100644
--- a/PROCESS.md
+++ b/PROCESS.md
@@ -119,6 +119,12 @@ only be left until after the freeze if:
are aware of it.
* It is in the correct milestone, with the ~Deliverable label.
+If a merge request is not ready, but the developers and Product Manager
+responsible for the feature think it is essential that it is in the release,
+they can [ask for an exception](#asking-for-an-exception) in advance. This is
+preferable to merging something that we are not confident in, but should still
+be a rare case: most features can be allowed to slip a release.
+
All Community Edition merge requests from GitLab team members merged on the
freeze date (the 7th) should have a corresponding Enterprise Edition merge
request, even if there are no conflicts. This is to reduce the size of the
@@ -134,6 +140,14 @@ Any merge requests cherry-picked into the stable branch for a previous release w
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.
+
+### 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,
you can ask for an exception to be made. Exceptions require sign-off from 3 people besides the developer:
@@ -152,11 +166,7 @@ When in doubt, we err on the side of _not_ cherry-picking.
For example, it is likely that an exception will be made for a trivial 1-5 line performance improvement
(e.g. adding a database index or adding `includes` to a query), but not for a new feature, no matter how relatively small or thoroughly tested.
-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.
+All MRs which have had exceptions granted must be merged by the 15th.
### Regressions