Commit 5f9592e4b098c06187091b9293f783ee5ebfcfde
Exists in
spb-stable
and in
3 other branches
Merge pull request #6405 from awiddersheim/fix_space_in_commit_message
Fix extra space added in beginning of commit message
Showing
1 changed file
with
1 additions
and
1 deletions
Show diff stats
lib/gitlab/satellite/merge_action.rb
| @@ -118,7 +118,7 @@ module Gitlab | @@ -118,7 +118,7 @@ module Gitlab | ||
| 118 | 118 | ||
| 119 | # merge the source branch into the satellite | 119 | # merge the source branch into the satellite |
| 120 | # will raise CommandFailed when merge fails | 120 | # will raise CommandFailed when merge fails |
| 121 | - repo.git.merge(default_options({no_ff: true}), "-m #{message}", "source/#{merge_request.source_branch}") | 121 | + repo.git.merge(default_options({no_ff: true}), "-m#{message}", "source/#{merge_request.source_branch}") |
| 122 | rescue Grit::Git::CommandFailed => ex | 122 | rescue Grit::Git::CommandFailed => ex |
| 123 | handle_exception(ex) | 123 | handle_exception(ex) |
| 124 | end | 124 | end |