diff options
| author | Hiroyuki Sato <sathiroyuki@gmail.com> | 2018-11-21 11:58:52 +0900 |
|---|---|---|
| committer | Hiroyuki Sato <sathiroyuki@gmail.com> | 2018-11-21 11:58:52 +0900 |
| commit | 692f87215df9c2a96c889a00fbb7cf8d459c3595 (patch) | |
| tree | 642e6a6dbc74b58cea5ffa8abddf6ee0ee422470 /PROCESS.md | |
| parent | b689b20f20f1a3773ba88cfb2f4d355d90389145 (diff) | |
| parent | 6a31259ccef5106126421ab5a93fd303a9326e4a (diff) | |
| download | gitlab-ce-692f87215df9c2a96c889a00fbb7cf8d459c3595.tar.gz | |
Merge remote-tracking branch 'origin/master' into fix-typos-occured
Conflicts:
- app/assets/javascripts/ide/stores/modules/pipelines/actions.js
- spec/javascripts/ide/stores/modules/pipelines/actions_spec.js
Diffstat (limited to 'PROCESS.md')
| -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 |