summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOswaldo Ferreira <oswaldo@gitlab.com>2018-11-19 12:12:47 -0200
committerOswaldo Ferreira <oswaldo@gitlab.com>2018-11-19 12:12:47 -0200
commitbbff415a8fcfef5a6c5b001b05abc34b168a9e29 (patch)
tree910d09147cfa61fddafe6f19dbf56bb3d4002354
parent536c128d603df476bfab5f2d3226683c50b1b8e2 (diff)
downloadgitlab-ce-bbff415a8fcfef5a6c5b001b05abc34b168a9e29.tar.gz
Improve FF "pick after the 7th" docsosw-mention-when-ff-revert-should-be-picked
-rw-r--r--PROCESS.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/PROCESS.md b/PROCESS.md
index 5fc2c4cf1df..aadd6a321f0 100644
--- a/PROCESS.md
+++ b/PROCESS.md
@@ -95,6 +95,12 @@ picked into the stable branches) up to the 19th of the month. Such merge
requests should have the ~"feature flag" label assigned, and don't require a
corresponding exception request to be created.
+In order to build the final package and present the feature for self-hosted
+customers, the feature flag should be removed. This should happen before the
+22nd, ideally _at least_ 2 days before. That means MRs with feature
+flags being picked at the 19th would have a quite tight schedule, so picking
+these _earlier_ is preferable.
+
While rare, release managers may decide to reject picking a change into a stable
branch, even when feature flags are used. This might be necessary if the changes
are deemed problematic, too invasive, or there simply isn't enough time to