diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2018-11-20 13:21:42 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2018-11-20 13:21:43 +0000 |
| commit | 7bbf09f45ae2356307120e56ee8d63cee564c0d9 (patch) | |
| tree | 41fbd00222c9eaa9041fec3706ed4a39328aeaa3 /PROCESS.md | |
| parent | 27a8297dd617ad4961025b3f26bed59c52e5e778 (diff) | |
| parent | 2ea250d4bff03b656403e85db14cc5a4be593c67 (diff) | |
| download | gitlab-ce-7bbf09f45ae2356307120e56ee8d63cee564c0d9.tar.gz | |
Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-11-20
# Conflicts:
# CHANGELOG.md
# locale/gitlab.pot
# spec/models/merge_request_spec.rb
# spec/models/project_wiki_spec.rb
# spec/models/repository_spec.rb
# spec/services/quick_actions/interpret_service_spec.rb
[ci skip]
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 f4b33865bc2..067611ef2f1 100644 --- a/PROCESS.md +++ b/PROCESS.md @@ -103,6 +103,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 |