From 1eb82b65c554f21d83447f895a6208905fabe112 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 18 Sep 2019 14:14:39 +0000 Subject: Add latest changes from gitlab-org/gitlab@12-3-auto-deploy-20190916 --- doc/development/changelog.md | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'doc/development/changelog.md') diff --git a/doc/development/changelog.md b/doc/development/changelog.md index afc18885a80..5667f58b0c3 100644 --- a/doc/development/changelog.md +++ b/doc/development/changelog.md @@ -102,13 +102,6 @@ Its simplest usage is to provide the value for `title`: bin/changelog 'Hey DZ, I added a feature to GitLab!' ``` -If you want to generate a changelog entry for GitLab EE, you will need to pass -the `--ee` option: - -```text -bin/changelog --ee 'Hey DZ, I added a feature to GitLab!' -``` - At this point the script would ask you to select the category of the change (mapped to the `type` field in the entry): ```text @@ -138,6 +131,9 @@ author: type: ``` +If you're working on the GitLab EE repository, the entry will be added to +`ee/changelogs/unreleased/` instead. + ### Arguments | Argument | Shorthand | Purpose | -- cgit v1.2.1