diff options
| author | awiddersheim <awiddersheim@hotmail.com> | 2014-02-24 20:53:57 -0500 |
|---|---|---|
| committer | awiddersheim <awiddersheim@hotmail.com> | 2014-02-24 20:53:57 -0500 |
| commit | e800fe0e50ff3766aa28f868b6650f330000d434 (patch) | |
| tree | 4b86c021f6e1d36806cfbe23b215a3512590dc66 /lib/gitlab/satellite/merge_action.rb | |
| parent | 504777ec20f006fd92cc948c03d35df3e1df4d3b (diff) | |
| download | gitlab-ce-e800fe0e50ff3766aa28f868b6650f330000d434.tar.gz | |
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 38d8d749d which allows a user
to change a merge commit message.
Diffstat (limited to 'lib/gitlab/satellite/merge_action.rb')
| -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 |