diff options
author | Robert Speicher <rspeicher@gmail.com> | 2018-11-20 10:50:51 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2018-11-20 10:50:51 +0000 |
commit | 646ba2418b630710edeaac94b57d08adf2771257 (patch) | |
tree | 844a34ab19634fc6f24fd98191a1d1f4dc7f208f | |
parent | 799486373e74711db65c2f77d11b1ec77fd7f4d9 (diff) | |
parent | bbff415a8fcfef5a6c5b001b05abc34b168a9e29 (diff) | |
download | gitlab-ce-646ba2418b630710edeaac94b57d08adf2771257.tar.gz |
Merge branch 'osw-mention-when-ff-revert-should-be-picked' into 'master'
Improve FF "pick after the 7th" docs
See merge request gitlab-org/gitlab-ce!23185
-rw-r--r-- | PROCESS.md | 6 |
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 |