summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-02-20 14:16:41 +0100
committerRémy Coutable <remy@rymai.me>2018-02-20 16:12:48 +0100
commit91f03a7ab2542de274506dcb1857a7d24ea0a1f0 (patch)
tree31da752bbc76b80d536c879ad485638e4c76c343
parent07fc0ea756af640aab38c7b00c10e3bc68c90d89 (diff)
downloadgitlab-ce-91f03a7ab2542de274506dcb1857a7d24ea0a1f0.tar.gz
Generate EE changelog under ee/changelogs/unreleased/
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rwxr-xr-xbin/changelog7
-rw-r--r--doc/development/changelog.md2
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