summaryrefslogtreecommitdiff
path: root/changelogs/README.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-09-19 01:45:44 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-09-19 01:45:44 +0000
commit85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch)
tree9160f299afd8c80c038f08e1545be119f5e3f1e1 /changelogs/README.md
parent15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff)
downloadgitlab-ce-85dc423f7090da0a52c73eb66faf22ddb20efff9.tar.gz
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'changelogs/README.md')
-rw-r--r--changelogs/README.md14
1 files changed, 14 insertions, 0 deletions
diff --git a/changelogs/README.md b/changelogs/README.md
index d408a74157a..3dad62474a2 100644
--- a/changelogs/README.md
+++ b/changelogs/README.md
@@ -8,3 +8,17 @@ To generate and validate your changelog entries:
See [development/changelog] documentation for detailed usage.
[development/changelog]: https://docs.gitlab.com/ee/development/changelog.html
+
+# Changelog archival
+
+The current major release is always in [CHANGELOG.md](../CHANGELOG.md) at the
+root of the repository.
+
+From GitLab 10.0.0 onwards, we store all changelog entries for a major release
+in their own file in this directory. For instance, the changelog entries for the
+10.X series of GitLab are in [archive-10.md](archive-10.md). Releases prior to
+10.0.0 have their changelogs archived in [archive.md](archive.md).
+
+Changelogs for GitLab Enterprise Edition features (all tiers) are in the
+corresponding `-ee` files, such as [CHANGELOG-EE.md](../CHANGELOG-EE.md) and
+[archive-12-ee.md](archive-12-ee.md).