From 0be1a45b9f4296016e758a5e650f516262fae640 Mon Sep 17 00:00:00 2001 From: Patricio Cano Date: Mon, 12 Jan 2015 22:19:22 -0500 Subject: [PATCH 1/2] Updated monthly.md add instructions about the handling of the CHANGELOG Added DISCLAIMER to CHANGELOG --- CHANGELOG | 2 ++ doc/release/monthly.md | 14 +++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 02ce71fdf5..1842ee3916 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 42a7e96ec3..7e2e4f41d6 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. From e588328674f1c0c956b924c9ec78391d209150cd Mon Sep 17 00:00:00 2001 From: Patricio Cano Date: Mon, 12 Jan 2015 22:26:51 -0500 Subject: [PATCH 2/2] Fixed wording in message. --- CHANGELOG | 2 +- doc/release/monthly.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 1842ee3916..08a9a1daa2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -DISCLAIMER: The upcoming release contains empty lines to reduce the number of merge conflicts, scroll down to see past releases. +Note: 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 7e2e4f41d6..175112b90c 100644 --- a/doc/release/monthly.md +++ b/doc/release/monthly.md @@ -90,7 +90,7 @@ 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. +Remove the Note text in the stable branches. ## Create RC1 (CE, EE, CI) @@ -103,7 +103,7 @@ lines to it. We do this in order to avoid merge conflicts when merging the CHANG 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. +> Note: The upcoming release contains empty lines to reduce the number of merge conflicts, scroll down to see past releases. ## QA