diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-13 21:04:25 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-04-13 21:04:25 +0400 |
| commit | 5f9592e4b098c06187091b9293f783ee5ebfcfde (patch) | |
| tree | 5ac6aba7404db360ce8d975e318fe58764757748 /lib/gitlab | |
| parent | d1547f86d9e6fd7c7418cde40ec8fd816deba800 (diff) | |
| parent | e800fe0e50ff3766aa28f868b6650f330000d434 (diff) | |
Merge pull request #6405 from awiddersheim/fix_space_in_commit_message
Fix extra space added in beginning of commit message
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/satellite/merge_action.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/satellite/merge_action.rb b/lib/gitlab/satellite/merge_action.rb index 85615f282c4..5f17aa60b8b 100644 --- a/lib/gitlab/satellite/merge_action.rb +++ b/lib/gitlab/satellite/merge_action.rb @@ -118,7 +118,7 @@ module Gitlab # merge the source branch into the satellite # 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 handle_exception(ex) end |