diff options
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | doc/release/monthly.md | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 02ce71fdf5b..1842ee39162 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +DISCLAIMER: The upcoming release contains empty lines to reduce the number of merge conflicts, scroll down to see past releases. + v 7.7.0 - - diff --git a/doc/release/monthly.md b/doc/release/monthly.md index 42a7e96ec35..7e2e4f41d6e 100644 --- a/doc/release/monthly.md +++ b/doc/release/monthly.md @@ -85,14 +85,26 @@ Stop merging code in master, except for important bug fixes ## Update changelog -Any changes not yet added to the changelog are added by lead developer and in that merge request the complete team is asked if there is anything missing. +Any changes not yet added to the changelog are added by lead developer and in that merge request the complete team is +asked if there is anything missing. There are three changelogs that need to be updated: CE, EE and CI. +Remove the DISCLAIMER text in the stable branches. + ## Create RC1 (CE, EE, CI) [Follow this How-to guide](howto_rc1.md) to create RC1. +## Prepare CHANGELOG for next release + +Once the stable branches have been created, update the CHANGELOG in `master` with the upcoming version and add 70 empty +lines to it. We do this in order to avoid merge conflicts when merging the CHANGELOG. + +Make sure that the CHANGELOG im master contains the following disclaimer message: + +> DISCLAIMER: The upcoming release contains empty lines to reduce the number of merge conflicts, scroll down to see past releases. + ## QA Create issue on dev.gitlab.org `gitlab` repository, named "GitLab X.X QA" in order to keep track of the progress. |