Merge branch 'jv-fix-changelog-rendering' into 'master'

Add empty line between changelog sections

See merge request gitlab-org/gitaly!730

2 files changed, 11 insertions, 5 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a793c3c1..690f381db 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 #### Added
 - Add StorageService::DeleteAllRepositories RPC
   https://gitlab.com/gitlab-org/gitaly/merge_requests/726
+
 #### Other
 - Fix Dangerfile bad changelog detection
   https://gitlab.com/gitlab-org/gitaly/merge_requests/724
diff --git a/_support/generate_changelog b/_support/generate_changelog
index 84e4b1176..f34b17d5e 100755
--- a/_support/generate_changelog
+++ b/_support/generate_changelog
@@ -37,24 +37,29 @@ def main(version)
     FileUtils.rm(yml)
   end
 
-  lines = []
+  sections = []
   types = entries.map(&:type).uniq.sort
   types.each do |type|
-    lines << "#### #{type.capitalize}\n"
+    text = ''
+    text << "#### #{type.capitalize}\n"
 
     entries.each do |e|
       next unless e.type == type
 
-      lines << e.to_s
+      text << e.to_s
     end
+
+    sections << text
   end
 
+  new_version_entry = ["## v#{version}\n\n", sections.join("\n"), "\n"].join
+
   current_changelog = File.read(CHANGELOG_FILE).lines
   header = current_changelog.shift(2)
 
-  new_changelog = [header, "## v#{version}\n\n", lines, "\n", current_changelog].flatten.join
+  new_changelog = [header, new_version_entry, current_changelog.join]
 
-  File.write(CHANGELOG_FILE, new_changelog)
+  File.write(CHANGELOG_FILE, new_changelog.join)
 end
 
 unless ARGV.count == 1