diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 08:43:02 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-20 08:43:02 +0000 |
commit | d9ab72d6080f594d0b3cae15f14b3ef2c6c638cb (patch) | |
tree | 2341ef426af70ad1e289c38036737e04b0aa5007 /doc/development/changelog.md | |
parent | d6e514dd13db8947884cd58fe2a9c2a063400a9b (diff) | |
download | gitlab-ce-d9ab72d6080f594d0b3cae15f14b3ef2c6c638cb.tar.gz |
Add latest changes from gitlab-org/gitlab@14-4-stable-eev14.4.0-rc42
Diffstat (limited to 'doc/development/changelog.md')
-rw-r--r-- | doc/development/changelog.md | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/development/changelog.md b/doc/development/changelog.md index be46d61eb4c..2753257c941 100644 --- a/doc/development/changelog.md +++ b/doc/development/changelog.md @@ -62,8 +62,8 @@ The value must be the full URL of the merge request. ### GitLab Enterprise changes -If a change is for GitLab Enterprise Edition, you must also add the trailer `EE: -true`: +If a change is exclusively for GitLab Enterprise Edition, **you must add** the +trailer `EE: true`: ```plaintext Update git vendor to gitlab @@ -77,6 +77,8 @@ MR: https://gitlab.com/foo/bar/-/merge_requests/123 EE: true ``` +**Do not** add the trailer for changes that apply to both EE and CE. + ## What warrants a changelog entry? - Any change that introduces a database migration, whether it's regular, post, |