diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-31 03:09:13 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-31 03:09:13 +0300 |
| commit | a1ed98e0c8c0562591bca710649b3ecca0a320d7 (patch) | |
| tree | 8b486e33ba345111b3e1f84066ff951937cb02be /doc/development/feature_flags | |
| parent | c8f773a8593926f4f2dec6f446a3b3e59e9c9909 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/feature_flags')
| -rw-r--r-- | doc/development/feature_flags/development.md | 5 |
1 files changed, 3 insertions, 2 deletions
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 |