Commit 4e169327 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'nuke-ugly-spaces-in-changelog-generator' into 'master'

Remove trailing whitespace when generating changelog entry

## What does this MR do?

It removes the trailing whitespace when a new changelog entry file is created by our changelog generator.

## Why was this MR needed?

If you run `bin/changelog` without passing merge request and author, these two lines are empty, with a trailing space at the end. I have to remove this trailing space manually.

See merge request !7948
parents 76072260 1c489296
...@@ -84,12 +84,15 @@ class ChangelogEntry ...@@ -84,12 +84,15 @@ class ChangelogEntry
end end
end end
private
def contents def contents
YAML.dump( yaml_content = YAML.dump(
'title' => title, 'title' => title,
'merge_request' => options.merge_request, 'merge_request' => options.merge_request,
'author' => options.author 'author' => options.author
) )
remove_trailing_whitespace(yaml_content)
end end
def write def write
...@@ -101,8 +104,6 @@ class ChangelogEntry ...@@ -101,8 +104,6 @@ class ChangelogEntry
exec("git commit --amend") exec("git commit --amend")
end end
private
def fail_with(message) def fail_with(message)
$stderr.puts "\e[31merror\e[0m #{message}" $stderr.puts "\e[31merror\e[0m #{message}"
exit 1 exit 1
...@@ -160,6 +161,10 @@ class ChangelogEntry ...@@ -160,6 +161,10 @@ class ChangelogEntry
def branch_name def branch_name
@branch_name ||= %x{git symbolic-ref --short HEAD}.strip @branch_name ||= %x{git symbolic-ref --short HEAD}.strip
end end
def remove_trailing_whitespace(yaml_content)
yaml_content.gsub(/ +$/, '')
end
end end
if $0 == __FILE__ if $0 == __FILE__
......
---
title: Remove trailing whitespace when generating changelog entry
merge_request: 7948
author:
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment