From 9fc3b2355af0ef322007df96dc6bc42bf07ac675 Mon Sep 17 00:00:00 2001 From: Steve Azzopardi Date: Wed, 10 Oct 2018 15:56:17 +0200 Subject: [PATCH] Add allowance to merge feature flags MRs After the 7th it is OK to merge code changes that are merged as long it is behind a feature flag. --- PROCESS.md | 1 + 1 file changed, 1 insertion(+) 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 -- GitLab