Commit e800fe0e authored by awiddersheim's avatar awiddersheim

Fix extra space added in beginning of commit message

Removes extra space in merge commit messages. This seems to have been
introduced by the functionality added in 38d8d749 which allows a user
to change a merge commit message.
parent 504777ec
...@@ -118,7 +118,7 @@ module Gitlab ...@@ -118,7 +118,7 @@ module Gitlab
# merge the source branch into the satellite # merge the source branch into the satellite
# will raise CommandFailed when merge fails # will raise CommandFailed when merge fails
repo.git.merge(default_options({no_ff: true}), "-m #{message}", "source/#{merge_request.source_branch}") repo.git.merge(default_options({no_ff: true}), "-m#{message}", "source/#{merge_request.source_branch}")
rescue Grit::Git::CommandFailed => ex rescue Grit::Git::CommandFailed => ex
handle_exception(ex) handle_exception(ex)
end end
......
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