diff options
| author | Robert Speicher <robert@gitlab.com> | 2018-02-20 16:20:22 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2018-02-20 16:20:22 +0000 |
| commit | 94811ee1b62a478f2beb89be00ea93fa42f015dc (patch) | |
| tree | 7c789861f9e9acec7fe4a8b97e043189bb20a565 | |
| parent | 644566041c803e7a82ae40a88f0a30cb05ce782a (diff) | |
| parent | 91f03a7ab2542de274506dcb1857a7d24ea0a1f0 (diff) | |
| download | gitlab-ce-94811ee1b62a478f2beb89be00ea93fa42f015dc.tar.gz | |
Merge branch '43427-generate-ee-changelog-items-in-ee-changelogs' into 'master'
Resolve "Change `bin/changelog` to generate EE changelog items in `ee/changelogs`"
Closes #43427
See merge request gitlab-org/gitlab-ce!17238
| -rwxr-xr-x | bin/changelog | 7 | ||||
| -rw-r--r-- | 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 |