Commit 646ba241 authored by Robert Speicher's avatar Robert Speicher

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
parents 79948637 bbff415a
...@@ -95,6 +95,12 @@ picked into the stable branches) up to the 19th of the month. Such merge ...@@ -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 requests should have the ~"feature flag" label assigned, and don't require a
corresponding exception request to be created. 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 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 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 are deemed problematic, too invasive, or there simply isn't enough time to
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment