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

Merge branch '43427-generate-ee-changelog-items-in-ee-changelogs' into 'master'
94811ee1 · Robert Speicher · 64456604 · 91f03a7a · 94811ee1 · 94811ee1
Commit 94811ee1 authored Feb 20, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 4 deletions

changelog bin/changelog +4 -3

changelog.md doc/development/changelog.md +1 -1

No files found.
--- 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?

--- 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