From 1c489296fd43fa45621b2ab6e6982327fb864b56 Mon Sep 17 00:00:00 2001
From: Adam Niedzielski <adamsunday@gmail.com>
Date: Fri, 9 Dec 2016 12:25:29 +0100
Subject: [PATCH] Remove trailing whitespace when generating changelog entry

---
 bin/changelog                                         | 11 ++++++++---
 .../nuke-ugly-spaces-in-changelog-generator.yml       |  4 ++++
 2 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 changelogs/unreleased/nuke-ugly-spaces-in-changelog-generator.yml

diff --git a/bin/changelog b/bin/changelog
index e07b1ad237a..4c894f8ff5b 100755
--- a/bin/changelog
+++ b/bin/changelog
@@ -84,12 +84,15 @@ class ChangelogEntry
     end
   end
 
+  private
+
   def contents
-    YAML.dump(
+    yaml_content = YAML.dump(
       'title'         => title,
       'merge_request' => options.merge_request,
       'author'        => options.author
     )
+    remove_trailing_whitespace(yaml_content)
   end
 
   def write
@@ -101,8 +104,6 @@ class ChangelogEntry
     exec("git commit --amend")
   end
 
-  private
-
   def fail_with(message)
     $stderr.puts "\e[31merror\e[0m #{message}"
     exit 1
@@ -160,6 +161,10 @@ class ChangelogEntry
   def branch_name
     @branch_name ||= %x{git symbolic-ref --short HEAD}.strip
   end
+
+  def remove_trailing_whitespace(yaml_content)
+    yaml_content.gsub(/ +$/, '')
+  end
 end
 
 if $0 == __FILE__
diff --git a/changelogs/unreleased/nuke-ugly-spaces-in-changelog-generator.yml b/changelogs/unreleased/nuke-ugly-spaces-in-changelog-generator.yml
new file mode 100644
index 00000000000..fd173031107
--- /dev/null
+++ b/changelogs/unreleased/nuke-ugly-spaces-in-changelog-generator.yml
@@ -0,0 +1,4 @@
+---
+title: Remove trailing whitespace when generating changelog entry
+merge_request: 7948
+author: