Commit 5f9592e4 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #6405 from awiddersheim/fix_space_in_commit_message

Fix extra space added in beginning of commit message
parents d1547f86 e800fe0e
...@@ -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