From 91f03a7ab2542de274506dcb1857a7d24ea0a1f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Tue, 20 Feb 2018 14:16:41 +0100 Subject: Generate EE changelog under ee/changelogs/unreleased/ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémy Coutable --- bin/changelog | 7 ++++--- doc/development/changelog.md | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bin/changelog b/bin/changelog index efe25032ba1..9b60f53ce40 100755 --- a/bin/changelog +++ b/bin/changelog @@ -214,9 +214,10 @@ class ChangelogEntry end def unreleased_path - File.join('changelogs', 'unreleased').tap do |path| - path << '-ee' if ee? - end + path = File.join('changelogs', 'unreleased') + path = File.join('ee', path) if ee? + + path end def ee? diff --git a/doc/development/changelog.md b/doc/development/changelog.md index 757987b2e7a..1962392a9eb 100644 --- a/doc/development/changelog.md +++ b/doc/development/changelog.md @@ -125,7 +125,7 @@ author: type: ``` If you're working on the GitLab EE repository, the entry will be added to -`changelogs/unreleased-ee/` instead. +`ee/changelogs/unreleased/` instead. ### Arguments -- cgit v1.2.1