diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-10-10 16:06:36 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-10-10 16:06:36 +0000 |
| commit | 39702ce6859864fc743caefc1b40a1a71d6d9ffe (patch) | |
| tree | cf1b1c197d8d23cb6600929f00fae76537217a6f | |
| parent | dbbeec7d71b85de6dc59261ac90cc6a0088c8eed (diff) | |
| parent | 9fc3b2355af0ef322007df96dc6bc42bf07ac675 (diff) | |
| download | gitlab-ce-39702ce6859864fc743caefc1b40a1a71d6d9ffe.tar.gz | |
Merge branch 'add-allowance-for-feature-flag-after-ff' into 'master'
Add allowance to merge feature flags MRs
See merge request gitlab-org/gitlab-ce!22267
| -rw-r--r-- | PROCESS.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/PROCESS.md b/PROCESS.md index 38ec01f9de0..5fc2c4cf1df 100644 --- a/PROCESS.md +++ b/PROCESS.md @@ -208,6 +208,7 @@ the stable branch are: * Fixes or improvements to automated QA scenarios * [Documentation updates](https://docs.gitlab.com/ee/development/documentation/workflow.html#documentation-shipped-late) for changes in the same release * New or updated translations (as long as they do not touch application code) +* Changes that are behind a feature flag and have the ~"feature flag" label During the feature freeze all merge requests that are meant to go into the upcoming release should have the correct milestone assigned _and_ the |