summaryrefslogtreecommitdiff
path: root/changelogs
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-09-08 12:12:01 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-09-08 12:12:01 +0000
commite2f984e14e1fd34e5105669c4306388019e6b5b6 (patch)
tree942c781a51a34c667c3c66e9d481f9fcf68459a3 /changelogs
parent5cd68a92fa0397121f25357ffae4a4bb6393ae72 (diff)
downloadgitlab-ce-e2f984e14e1fd34e5105669c4306388019e6b5b6.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'changelogs')
-rw-r--r--changelogs/README.md12
1 files changed, 5 insertions, 7 deletions
diff --git a/changelogs/README.md b/changelogs/README.md
index 3dad62474a2..1d1a19a0341 100644
--- a/changelogs/README.md
+++ b/changelogs/README.md
@@ -1,13 +1,11 @@
# Generating changelog entries
-To generate and validate your changelog entries:
+From GitLab 14.0.0 onwards, [CHANGELOG.md](../CHANGELOG.md) is generated
+by parsing [Git trailers](https://git-scm.com/docs/git-interpret-trailers)
+in commit messages.
-1. Run `bin/changelog` to generate.
-1. Run `yamllint changelogs` to validate.
-
-See [development/changelog] documentation for detailed usage.
-
-[development/changelog]: https://docs.gitlab.com/ee/development/changelog.html
+See [documentation](https://docs.gitlab.com/ee/development/changelog.html#how-to-generate-a-changelog-entry)
+on how to generate changelog entries.
# Changelog archival