Generate EE changelog under ee/changelogs/unreleased/

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?

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