From a1ed98e0c8c0562591bca710649b3ecca0a320d7 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 31 Jan 2020 00:09:13 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/development/feature_flags/development.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'doc/development/feature_flags/development.md') diff --git a/doc/development/feature_flags/development.md b/doc/development/feature_flags/development.md index cb5d5fe9ab4..b3fc9c291c6 100644 --- a/doc/development/feature_flags/development.md +++ b/doc/development/feature_flags/development.md @@ -24,8 +24,9 @@ end ``` Features that are developed and are intended to be merged behind a feature flag -should not include a changelog entry. The entry should be added in the merge -request removing the feature flag. If the feature contains any DB migration it +should not include a changelog entry. The entry should either be added in the merge +request removing the feature flag or the merge request where the default value of +the feature flag is set to true. If the feature contains any DB migration it should include a changelog entry for DB changes. In the rare case that you need the feature flag to be on automatically, use -- cgit v1.2.1