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

1 files changed, 4 insertions, 3 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?