Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-11-03 21:11:17 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-11-03 21:11:17 +0300
commit44434461b3c58336624125b5ab002e7200e4a208 (patch)
treecef2ea602e94abd9c1ef6ee77b6988c4c85475b7 /doc/development/changelog.md
parente6fa9529b4922a4c552e8908a2929ff995e8b53d (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/development/changelog.md')
-rw-r--r--doc/development/changelog.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/development/changelog.md b/doc/development/changelog.md
index 7dc3ae0a80b..6e3ee92f2c1 100644
--- a/doc/development/changelog.md
+++ b/doc/development/changelog.md
@@ -41,6 +41,10 @@ vendor field to be `gitlab` to avoid cve matching old versions.
Changelog: changed
```
+If your merge request has multiple commits,
+[make sure to add the `Changelog` entry to the first commit](changelog.md#how-to-generate-a-changelog-entry).
+This ensures that the correct entry is generated when commits are squashed.
+
### Overriding the associated merge request
GitLab automatically links the merge request to the commit when generating the