summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rwxr-xr-xbin/changelog11
1 files changed, 8 insertions, 3 deletions
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__